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

surveyjs · Jul 5, 2019 · 2ab37ff · 2ab37ff
2 parents 0f64d59 + 9d25758
commit 2ab37ff
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,26 @@
 
 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.0.96"></a>
+## [1.0.96](https://github.com/surveyjs/widgets/compare/v1.0.95...v1.0.96) (2019-07-02)
+
+
+
+<a name="1.0.95"></a>
+## [1.0.95](https://github.com/surveyjs/widgets/compare/v1.0.94...v1.0.95) (2019-06-25)
+
+
+
+<a name="1.0.94"></a>
+## [1.0.94](https://github.com/surveyjs/widgets/compare/v1.0.93...v1.0.94) (2019-06-22)
+
+
+
+<a name="1.0.93"></a>
+## [1.0.93](https://github.com/surveyjs/widgets/compare/v1.0.92...v1.0.93) (2019-06-20)
+
+
+
 <a name="1.0.92"></a>
 ## [1.0.92](https://github.com/surveyjs/widgets/compare/v1.0.91...v1.0.92) (2019-06-11)
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "surveyjs-widgets",
-  "version": "1.0.92",
+  "version": "1.0.96",
   "scripts": {
     "start": "npm run build && live-server",
     "watch": "webpack --env.buildType dev --watch",

diff --git a/src/select2-tagbox.js b/src/select2-tagbox.js
@@ -111,7 +111,7 @@ function init(Survey, $) {
       $el.on("select2:unselect", function(e) {
         var index = (question.value || []).indexOf(e.params.data.id);
         if (index !== -1) {
-          var val = question.value;
+          var val = [].concat(question.value);
           val.splice(index, 1);
           question.value = val;
         }

diff --git a/src/select2.js b/src/select2.js
@@ -84,7 +84,7 @@ function init(Survey, $) {
         if (settings) {
           if (settings.ajax) {
             $el.select2(settings);
-            question.clearIncorrectValuesCallback = function () { };
+            question.keepIncorrectValues = true;
           } else {
             settings.data = question.visibleChoices.map(function (choice) {
               return {
@@ -140,7 +140,6 @@ function init(Survey, $) {
         .off("select2:select")
         .select2("destroy");
       question.readOnlyChangedCallback = null;
-      question.clearIncorrectValuesCallback = null;
     }
   };