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

Author: Dmitry Kuzin (DevExpress)

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 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.
 
+### [1.8.17](https://github.com/surveyjs/custom-widgets/compare/v1.8.16...v1.8.17) (2020-11-26)
+
+### [1.8.16](https://github.com/surveyjs/custom-widgets/compare/v1.8.14...v1.8.16) (2020-11-24)
+
+### [1.8.14](https://github.com/surveyjs/custom-widgets/compare/v1.8.13...v1.8.14) (2020-11-19)
+
+### [1.8.13](https://github.com/surveyjs/custom-widgets/compare/v1.8.12...v1.8.13) (2020-11-09)
+
 ### [1.8.12](https://github.com/surveyjs/custom-widgets/compare/v1.8.11...v1.8.12) (2020-10-28)
 
 ### [1.8.11](https://github.com/surveyjs/custom-widgets/compare/v1.8.10...v1.8.11) (2020-10-23)

devops-integration.yml

@@ -15,7 +15,7 @@ pool:
 steps:
   - task: NodeTool@0
     inputs:
-      versionSpec: "12.x"
+      versionSpec: "14.x"
     displayName: "Install Node.js"
 
   - script: |
@@ -39,6 +39,28 @@ steps:
       Contents: "**"
       TargetFolder: "$(Build.Repository.LocalPath)/node_modules/survey-core"
       OverWrite: true
+
+# npm run release with version
+  - task: CopyFiles@2
+    inputs:
+      SourceFolder: '$(System.ArtifactsDirectory)/SurveyJSLibraryBuild/'
+      Contents: 'version.txt'
+      TargetFolder: '$(Build.SourcesDirectory)/'
+      OverWrite: true
+    displayName: 'Copy Build Artifact - SurveyJSVersion File'
+
+  - powershell: |
+      $version = Get-Content $(Build.SourcesDirectory)/version.txt
+      Write-Host "##vso[task.setvariable variable=SurveyJSVersion;]$version"
+    displayName: 'setup SurveyJSVersion variable from SurveyJSVersionFile'
+
+  - powershell: |
+      $env:GIT_REDIRECT_STDERR = '2>&1'
+      git config --global user.email "[email protected]"
+      git config --global user.name "dmitrykurmanov"
+      npm run release -- --release-as $(SurveyJSVersion)
+    displayName: 'npm run release specific version'
+#####################################################
 
   - script: |
       npm run build

package-lock.json

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

package.json

@@ -62,6 +62,7 @@ steps:
   displayName: "build"
 
 - powershell: |
+    git pull origin master
     git push --follow-tags origin master;
   displayName: 'push release commit to github'
 

release-azure-pipeline.yml

@@ -102,20 +102,16 @@ function init(Survey, $) {
           daysOfWeekHighlighted: question.daysOfWeekHighlighted,
           disableTouchKeyboard: question.disableTouchKeyboard,
         })
-        // .on("changeDate", function (e) {
-        //     question.value = moment(e.date).format("DD/MM/YYYY");
-        //     // `e` here contains the extra attributes
-        // })
         .on("change", function (e) {
-          var newValue = pickerWidget.val();
+          var newDate = pickerWidget.bootstrapDP("getUTCDate");
+          var newValue = newDate && newDate.toUTCString();
           if (question.value != newValue) {
             question.value = newValue;
           }
         });
 
       question.valueChangedCallback = function () {
-        pickerWidget.val(question.value);
-        // $el.bootstrapDP('update', moment(question.value, "DD/MM/YYYY").toDate());
+        pickerWidget.bootstrapDP("setUTCDate", !!question.value ? new Date(question.value) : "");
       };
       question.valueChangedCallback();
       question.readOnlyChangedCallback = function () {

src/bootstrapdatepicker.js

@@ -53,8 +53,8 @@ function init(Survey) {
             Survey.JsonObject.metaData.addProperty(supportedType, {
               name: "renderAs",
               category: "general",
-              default: "standard",
-              choices: ["standard", "prettycheckbox"],
+              default: "default",
+              choices: ["default", "prettycheckbox"],
             });
           }
         });

src/pretty-checkbox.js

@@ -26,8 +26,8 @@ function init(Survey, $) {
         Survey.JsonObject.metaData.addProperty("dropdown", {
           name: "renderAs",
           category: "general",
-          default: "standard",
-          choices: ["select2", "standard"],
+          default: "default",
+          choices: ["select2", "default"],
         });
         Survey.JsonObject.metaData.addProperty("dropdown", {
           dependsOn: "renderAs",

src/select2.js

@@ -141,10 +141,11 @@ function init(Survey) {
         disabled: question.isReadOnly,
         group: {
           name: question.name,
-          put: function (to) {
+          put: function (to, from) {
             return (
-              question.maxAnswersCount < 0 ||
-              to.el.children.length <= question.maxAnswersCount
+              to.options.group && from.options.group && to.options.group.name === from.options.group.name &&
+              (question.maxAnswersCount < 0 ||
+              to.el.children.length <= question.maxAnswersCount)
             );
           },
         },