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

Author: Dmitry Kuzin (DevExpress)

CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+<a name="1.1.20"></a>
+## [1.1.20](https://github.com/surveyjs/widgets/compare/v1.1.19...v1.1.20) (2019-11-12)
+
+
+
+<a name="1.1.19"></a>
+## [1.1.19](https://github.com/surveyjs/widgets/compare/v1.1.18...v1.1.19) (2019-11-06)
+
+
+
 <a name="1.1.18"></a>
 ## [1.1.18](https://github.com/surveyjs/widgets/compare/v1.1.17...v1.1.18) (2019-10-30)
 

examples/jquery/index.js

@@ -40,7 +40,7 @@ function init() {
 
   Survey.defaultBootstrapCss.navigationButton = "btn btn-primary";
   //Survey.Survey.cssType = "bootstrapmaterial";
-  Survey.Survey.cssType = "bootstrap";
+  Survey.Model.cssType = "bootstrap";
 
   var model = new Survey.Model(json);
   window.survey = model;

package.json

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

src/inputmask.js

@@ -7,7 +7,6 @@ function init(Survey) {
     numericAutoGroup: true,
     numericDigits: 2,
     numericDigitsOptional: false,
-    numericPrefix: "$",
     numericPlaceholder: "0",
     autoUnmask: true,
     widgetIsLoaded: function() {
@@ -27,8 +26,9 @@ function init(Survey) {
         "inputFormat",
         {
           name: "prefix",
-          default: "$"
+          visible: false
         },
+        "currencySymbol",
         {
           name: "autoUnmask:boolean",
           default: true
@@ -79,7 +79,9 @@ function init(Survey) {
       if (surveyElement.inputMask == "currency") {
         options.digits = rootWidget.numericDigits;
         options.digitsOptional = rootWidget.numericDigitsOptional;
-        options.prefix = surveyElement.prefix || rootWidget.numericPrefix;
+        options.prefix = surveyElement.currencySymbol || surveyElement.prefix ||
+          Survey.cultureInfo && Survey.cultureInfo.getCulture(
+            surveyElement.culture).currencySymbol || "";
         options.placeholder = rootWidget.numericPlaceholder;
       }
       if (surveyElement.inputMask == "datetime") {
@@ -98,6 +100,16 @@ function init(Survey) {
         surveyElement.customWidgetData.isNeedRender = true;
       };
 
+      $(el).on('focusout change', function () {
+
+        if ($(el).inputmask('isComplete')) {
+          surveyElement.value = $(el).val();
+        } else {
+          surveyElement.value = null;
+        }
+
+      });      
+
       var updateHandler = function() {
         el.value =
           typeof surveyElement.value === "undefined" ? "" : surveyElement.value;

src/jquery-ui-datepicker.js

@@ -1,4 +1,5 @@
 function init(Survey, $) {
+
   $ = $ || window.$;
   if (!$.fn.bootstrapDP && !!$.fn.datepicker && !!$.fn.datepicker.noConflict) {
     $.fn.bootstrapDP = $.fn.datepicker.noConflict();
@@ -35,6 +36,33 @@ function init(Survey, $) {
         name: "config",
         default: null
       });
+      Survey.JsonObject.metaData.addProperty("datepicker", {
+        name: "dateSeparator",
+        choices: function(obj) {
+          return Survey.cultureInfo && Survey.cultureInfo.getCulture(obj && obj.culture).dateSeparators || [];
+        },
+        onSetValue: function(obj, value, jsonConv) {
+          var newValue = value || "/";
+          if(!!obj.shortDateFormat) {
+            var regex = new RegExp(obj.dateSeparator, 'g');
+            obj.shortDateFormat =  obj.shortDateFormat.replace(regex, newValue);
+          }
+          obj.setPropertyValue("dateSeparator", newValue);
+        },
+        default: "/"
+      });
+      Survey.JsonObject.metaData.addProperty("datepicker", {
+        name: "shortDateFormat",
+        dependsOn: "dateSeparator",
+        choices: function(obj) {
+          return (Survey.cultureInfo && Survey.cultureInfo.getCulture(obj && obj.culture).shortDateFormats || []).map(function(fmt) {
+            return {
+              text: fmt.text.replace(/\//g, obj.dateSeparator || "/"),
+              value: fmt.value.replace(/\//g, obj.dateSeparator || "/")
+            }
+          });
+        }
+      });
     },
     afterRender: function(question, el) {
       var $el = $(el).is(".widget-datepicker")
@@ -50,6 +78,11 @@ function init(Survey, $) {
         config.dateFormat = !!question.dateFormat
           ? question.dateFormat
           : undefined;
+          if (config.dateFormat === undefined) {
+            config.dateFormat = !!question.shortDateFormat
+            ? question.shortDateFormat
+            : undefined;
+          }
       }
       if (config.option === undefined) {
         config.option = {