Merge branch 'master' of https://github.com/surveyjs/widgets

Author: dmitry-kurmanov

src/easy-autocomplete.js

@@ -3,7 +3,7 @@ function init(Survey, $) {
   var widget = {
     name: "autocomplete",
     widgetIsLoaded: function() {
-      return !!$.fn.easyAutocomplete;
+      return typeof $ == "function" && !!$.fn.easyAutocomplete;
     },
     isFit: function(question) {
       return question.getType() === "text";

src/emotionsratings.js

@@ -6,7 +6,7 @@ function init(Survey, $) {
     title: "Emotions Ratings",
     iconName: "icon-emotionsratings",
     widgetIsLoaded: function() {
-      return !!$.fn.emotionsRating;
+      return typeof $ == "function" && !!$.fn.emotionsRating;
     },
     defaultJSON: {
       choices: [1, 2, 3, 4, 5]

src/icheck.js

@@ -3,15 +3,15 @@ function init(Survey, $) {
   var widget = {
     className: "iradio_square-blue",
     name: "icheck",
-    widgetIsLoaded: function () {
-      return !!$.fn.iCheck;
+    widgetIsLoaded: function() {
+      return typeof $ == "function" && !!$.fn.iCheck;
     },
-    isFit: function (question) {
+    isFit: function(question) {
       var t = question.getType();
       return t === "radiogroup" || t === "checkbox" || t === "matrix";
     },
     isDefaultRender: true,
-    afterRender: function (question, el) {
+    afterRender: function(question, el) {
       var rootWidget = this;
       var $el = $(el);
       $el.find("input").data({
@@ -22,17 +22,17 @@ function init(Survey, $) {
         checkboxClass: rootWidget.className,
         radioClass: rootWidget.className
       });
-      var select = function () {
+      var select = function() {
         if (question.getType() !== "matrix") {
           var values = question.value;
           if (!Array.isArray(values)) {
             values = [values];
           }
-          values.forEach(function (value) {
+          values.forEach(function(value) {
             $el.find("input[value=" + value + "]").iCheck("check");
           });
         } else {
-          question.generatedVisibleRows.forEach(function (row, index, rows) {
+          question.generatedVisibleRows.forEach(function(row, index, rows) {
             if (row.value) {
               $(el)
                 .find(
@@ -43,9 +43,9 @@ function init(Survey, $) {
           });
         }
       };
-      $el.find("input").on("ifChecked", function (event) {
+      $el.find("input").on("ifChecked", function(event) {
         if (question.getType() === "matrix") {
-          question.generatedVisibleRows.forEach(function (row, index, rows) {
+          question.generatedVisibleRows.forEach(function(row, index, rows) {
             if (row.fullName === event.target.name) {
               row.value = event.target.value;
             }
@@ -60,7 +60,7 @@ function init(Survey, $) {
           question.value = event.target.value;
         }
       });
-      $el.find("input").on("ifUnchecked", function (event) {
+      $el.find("input").on("ifUnchecked", function(event) {
         if (question.getType() === "checkbox") {
           var oldValue = question.value || [];
           var index = oldValue.indexOf(event.target.value);
@@ -73,7 +73,7 @@ function init(Survey, $) {
       question.valueChangedCallback = select;
       select();
     },
-    willUnmount: function (question, el) {
+    willUnmount: function(question, el) {
       var $el = $(el);
       $el.find("input").iCheck("destroy");
     }
@@ -86,4 +86,4 @@ if (typeof Survey !== "undefined") {
   init(Survey, window.$);
 }
 
-export default init;
+export default init;

src/image-picker.js

@@ -5,7 +5,7 @@ function init(Survey, $) {
     title: "Image picker",
     iconName: "icon-imagepicker",
     widgetIsLoaded: function() {
-      return !!$.fn.imagepicker;
+      return typeof $ == "function" && !!$.fn.imagepicker;
     },
     isFit: function(question) {
       return question.getType() === "imagepicker";

src/jquery-bar-rating.js

@@ -5,7 +5,7 @@ function init(Survey, $) {
     title: "Bar rating",
     iconName: "icon-barrating",
     widgetIsLoaded: function() {
-      return !!$.fn.barrating;
+      return typeof $ == "function" && !!$.fn.barrating;
     },
     defaultJSON: { choices: [1, 2, 3, 4, 5] },
     isFit: function(question) {

src/jquery-ui-datepicker.js

@@ -5,7 +5,7 @@ function init(Survey, $) {
     title: "Date picker",
     iconName: "icon-datepicker",
     widgetIsLoaded: function() {
-      return !!$.fn.datepicker;
+      return !!$ && !!$.fn.datepicker;
     },
     isFit: function(question) {
       return question.getType() === "datepicker";

src/nouislider.js

@@ -30,7 +30,9 @@ function init(Survey) {
       ]);
     },
     afterRender: function(question, el) {
-      question.value = (question.rangeMin + question.rangeMax) / 2;
+      if (question.isEmpty()) {
+        question.value = (question.rangeMin + question.rangeMax) / 2;
+      }
 
       el.style.marginBottom = "50px";
       var slider = noUiSlider.create(el, {
@@ -57,6 +59,7 @@ function init(Survey) {
       if (question.isReadOnly) {
         el.setAttribute("disabled", true);
       }
+      updateValueHandler();
       question.noUiSlider = slider;
       question.valueChangedCallback = updateValueHandler;
       question.readOnlyChangedCallback = function() {
@@ -65,7 +68,7 @@ function init(Survey) {
         } else {
           el.removeAttribute("disabled");
         }
-      }
+      };
     },
     willUnmount: function(question, el) {
       question.noUiSlider.destroy();