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

Author: dmitry-kurmanov

package.json

@@ -1,6 +1,6 @@
 {
   "name": "surveyjs-widgets",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "scripts": {
     "start": "npm run build && live-server",
     "prebuild": "webpack --env.buildType dev",

src/image-picker.js

@@ -14,23 +14,16 @@ function init(Survey, $) {
     activatedByChanged: function(activatedBy) {
       Survey.JsonObject.metaData.addClass(
         "imageitemvalues",
-        [{ name: "imageLink" }],
+        [],
         null,
         "itemvalue"
       );
+      Survey.JsonObject.metaData.addProperty("imagepicker", {
+        name: "imageLink"
+      });
       Survey.JsonObject.metaData.addClass(
         "imagepicker",
         [
-          {
-            name: "choices:imageitemvalues",
-            onGetValue: function(obj) {
-              return Survey.ItemValue.getData(obj.choices);
-            },
-            onSetValue: function(obj, value) {
-              obj.choices = value;
-            }
-          },
-          { name: "showLabel:boolean", default: false },
           { name: "hasOther", visible: false },
           { name: "otherText", visible: false },
           { name: "optionsCaption", visible: false },
@@ -41,6 +34,19 @@ function init(Survey, $) {
         null,
         "dropdown"
       );
+      Survey.JsonObject.metaData.addProperty("imagepicker", {
+        name: "showLabel:boolean",
+        default: false
+      });
+      Survey.JsonObject.metaData.addProperty("imagepicker", {
+        name: "choices:imageitemvalues",
+        onGetValue: function(obj) {
+          return Survey.ItemValue.getData(obj.choices);
+        },
+        onSetValue: function(obj, value) {
+          obj.choices = value;
+        }
+      });
     },
     afterRender: function(question, el) {
       var $el = $(el).is("select") ? $(el) : $(el).find("select");

src/signature_pad.js

@@ -63,7 +63,9 @@ function init(Survey) {
         canvas.width = question.width;
         canvas.height = question.height;
         resizeCanvas(canvas);
-        signaturePad.fromDataURL(question.value);
+        signaturePad.fromDataURL(
+          question.value || "data:image/gif;base64,R0lGODlhAQABAIAAAP"
+        );
       };
       question.valueChangedCallback = updateValueHandler;
       updateValueHandler();