Fix datepicker loading

Author: Dmitry Kuzin (DevExpress)

src/bootstrapdatepicker.js

@@ -1,6 +1,9 @@
 function init(Survey) {
-    if (!$.fn.bootstrapDP && !!$.fn.datepicker.noConflict) {
-        $.fn.bootstrapDP = $.fn.datepicker;
+    if (!$.fn.bootstrapDP && !!$.fn.datepicker && !!$.fn.datepicker.noConflict) {
+        $.fn.bootstrapDP = $.fn.datepicker.noConflict();
+        if (!$.fn.datepicker) {
+            $.fn.datepicker = $.fn.bootstrapDP;
+        }
     }
     var widget = {
         name: "bootstrapdatepicker",

src/jquery-ui-datepicker.js

@@ -1,14 +1,14 @@
 function init(Survey, $) {
   $ = $ || window.$;
-  if (!!$.fn.datepicker && !!$.fn.datepicker.noConflict) {
+  if (!$.fn.bootstrapDP && !!$.fn.datepicker && !!$.fn.datepicker.noConflict) {
     $.fn.bootstrapDP = $.fn.datepicker.noConflict();
   }
   var widget = {
     name: "datepicker",
     title: "Date picker",
     iconName: "icon-datepicker",
     widgetIsLoaded: function () {
-      return !!$ && !!$.fn.datepicker;
+      return !!$ && !!$.fn.datepicker && !$.fn.datepicker.noConflict;
     },
     isFit: function (question) {
       return question.getType() === "datepicker";