Inicio Explorar Axuda
Iniciar sesión
hugh
/
select2
1
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

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

phtrivier %!s(int64=12) %!d(string=hai) anos
pai
d0410144ba
achega
cf095d9fee
Modificáronse 2 ficheiros con 53 adicións e 7 borrados
Unificar vista Mostrar estatísticas de Diff
  1. 25 7
      select2.js
  2. 28 0
      test-619.html

+ 25 - 7
select2.js
Ver ficheiro 

@@ -1736,7 +1736,7 @@ the specific language governing permissions and limitations under the Apache Lic
 
 
 
         // single
 
         // single
 
         val: function () {
 
         val: function () {
 
-            var val, data = null, self = this;
 
+            var val, triggerChange = true, data = null, self = this;
 
 
 
             if (arguments.length === 0) {
 
             if (arguments.length === 0) {
 
                 return this.opts.element.val();
 
                 return this.opts.element.val();
 
@@ -1744,6 +1744,10 @@ the specific language governing permissions and limitations under the Apache Lic
 
 
 
             val = arguments[0];
 
             val = arguments[0];
 
 
 
+            if (arguments.length > 1) {
 
+                triggerChange = arguments[1];
 
+            }
 
+
 
             if (this.select) {
 
             if (this.select) {
 
                 this.select
 
                 this.select
 
                     .val(val)
 
                     .val(val)
 
@@ -1753,7 +1757,9 @@ the specific language governing permissions and limitations under the Apache Lic
 
                     });
 
                     });
 
                 this.updateSelection(data);
 
                 this.updateSelection(data);
 
                 this.setPlaceholder();
 
                 this.setPlaceholder();
 
-                this.triggerChange();
 
+                if (triggerChange) {
 
+                    this.triggerChange();
 
+                }
 
             } else {
 
             } else {
 
                 if (this.opts.initSelection === undefined) {
 
                 if (this.opts.initSelection === undefined) {
 
                     throw new Error("cannot call val() if initSelection() is not defined");
 
                     throw new Error("cannot call val() if initSelection() is not defined");
 
@@ -1761,7 +1767,9 @@ the specific language governing permissions and limitations under the Apache Lic
 
                 // val is an id. !val is true for [undefined,null,'']
 
                 // val is an id. !val is true for [undefined,null,'']
 
                 if (!val) {
 
                 if (!val) {
 
                     this.clear();
 
                     this.clear();
 
-                    this.triggerChange();
 
+                    if (triggerChange) {
 
+                        this.triggerChange();
 
+                    }
 
                     return;
 
                     return;
 
                 }
 
                 }
 
                 this.opts.element.val(val);
 
                 this.opts.element.val(val);
 
@@ -2278,7 +2286,7 @@ the specific language governing permissions and limitations under the Apache Lic
 
 
 
         // multi
 
         // multi
 
         val: function () {
 
         val: function () {
 
-            var val, data = [], self=this;
 
+            var val, triggerChange = true, data = [], self=this;
 
 
 
             if (arguments.length === 0) {
 
             if (arguments.length === 0) {
 
                 return this.getVal();
 
                 return this.getVal();
 
@@ -2286,11 +2294,17 @@ the specific language governing permissions and limitations under the Apache Lic
 
 
 
             val = arguments[0];
 
             val = arguments[0];
 
 
 
+            if (arguments.length > 1) {
 
+                triggerChange = arguments[1];
 
+            }
 
+
 
             if (!val) {
 
             if (!val) {
 
                 this.opts.element.val("");
 
                 this.opts.element.val("");
 
                 this.updateSelection([]);
 
                 this.updateSelection([]);
 
                 this.clearSearch();
 
                 this.clearSearch();
 
-                this.triggerChange();
 
+                if (triggerChange) {
 
+                    this.triggerChange();
 
+                }
 
                 return;
 
                 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()});
 
                     data.push({id: $(this).attr("value"), text: $(this).text()});
 
                 });
 
                 });
 
                 this.updateSelection(data);
 
                 this.updateSelection(data);
 
-                this.triggerChange();
 
+                if (triggerChange) {
 
+                    this.triggerChange();
 
+                }
 
             } else {
 
             } else {
 
                 if (this.opts.initSelection === undefined) {
 
                 if (this.opts.initSelection === undefined) {
 
                     throw new Error("val() cannot be called if initSelection() is not defined")
 
                     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.setVal(ids);
 
                     self.updateSelection(data);
 
                     self.updateSelection(data);
 
                     self.clearSearch();
 
                     self.clearSearch();
 
-                    self.triggerChange();
 
+                    if (triggerChange) {
 
+                        self.triggerChange();
 
+                    }
 
                 });
 
                 });
 
             }
 
             }
 
             this.clearSearch();
 
             this.clearSearch();

+ 28 - 0
test-619.html
Ver ficheiro 

@@ -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>