select2#619 : val takes an optional argument to avoid triggering 'change'

phtrivier · phtrivier · commit cf095d9fee82 · 2013-01-30T10:21:40.000+01:00
diff --git a/select2.js b/select2.js
@@ -1736,14 +1736,18 @@ the specific language governing permissions and limitations under the Apache Lic
 
         // single
         val: function () {
-            var val, data = null, self = this;
+            var val, triggerChange = true, data = null, self = this;
 
             if (arguments.length === 0) {
                 return this.opts.element.val();
             }
 
             val = arguments[0];
 
+            if (arguments.length > 1) {
+                triggerChange = arguments[1];
+            }
+
             if (this.select) {
                 this.select
                     .val(val)
@@ -1753,15 +1757,19 @@ the specific language governing permissions and limitations under the Apache Lic
                     });
                 this.updateSelection(data);
                 this.setPlaceholder();
-                this.triggerChange();
+                if (triggerChange) {
+                    this.triggerChange();
+                }
             } else {
                 if (this.opts.initSelection === undefined) {
                     throw new Error("cannot call val() if initSelection() is not defined");
                 }
                 // val is an id. !val is true for [undefined,null,'']
                 if (!val) {
                     this.clear();
-                    this.triggerChange();
+                    if (triggerChange) {
+                        this.triggerChange();
+                    }
                     return;
                 }
                 this.opts.element.val(val);
@@ -2278,19 +2286,25 @@ the specific language governing permissions and limitations under the Apache Lic
 
         // multi
         val: function () {
-            var val, data = [], self=this;
+            var val, triggerChange = true, data = [], self=this;
 
             if (arguments.length === 0) {
                 return this.getVal();
             }
 
             val = arguments[0];
 
+            if (arguments.length > 1) {
+                triggerChange = arguments[1];
+            }
+
             if (!val) {
                 this.opts.element.val("");
                 this.updateSelection([]);
                 this.clearSearch();
-                this.triggerChange();
+                if (triggerChange) {
+                    this.triggerChange();
+                }
                 return;
             }
 
@@ -2302,7 +2316,9 @@ the specific language governing permissions and limitations under the Apache Lic
                     data.push({id: $(this).attr("value"), text: $(this).text()});
                 });
                 this.updateSelection(data);
-                this.triggerChange();
+                if (triggerChange) {
+                    this.triggerChange();
+                }
             } else {
                 if (this.opts.initSelection === undefined) {
                     throw new Error("val() cannot be called if initSelection() is not defined")
@@ -2313,7 +2329,9 @@ the specific language governing permissions and limitations under the Apache Lic
                     self.setVal(ids);
                     self.updateSelection(data);
                     self.clearSearch();
-                    self.triggerChange();
+                    if (triggerChange) {
+                        self.triggerChange();
+                    }
                 });
             }
             this.clearSearch();
diff --git a/test-619.html b/test-619.html
@@ -0,0 +1,28 @@
+<html>
+  <head>
+    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
+    <link href="select2.css" rel="stylesheet"/>
+    <script type="text/javascript" src="select2.js"></script>
+ </head>
+ <body>
+   <select id="s1">
+     <option value="A"></option>
+     <option value="B"></option>
+   </select>
+
+    <script type="text/javascript">
+      $(document).ready(function () {
+      $("#s1").select2({}).on("change", function () {
+         alert("Changed caused by val()");
+      }).select2("val", "A");
+
+      // This should not trigger a change
+      $("#s1").select2("val", "B", false);
+      });
+
+    </script>
+
+
+ </body>
+
+</html>
