RetailCRM-Mirror/select2
1
0
Fork 0
mirror of synced 2024-11-26 14:56:07 +03:00
Code Issues Projects Releases Wiki Activity

Do not trigger event when calling clear() from val() with empty value

Browse Source
This commit is contained in:
Vincent Petry 2013-02-21 10:53:16 +01:00
parent cd0adbe913
commit 08b75a1798
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
select2.js
View File

@ -1747,7 +1747,7 @@ the specific language governing permissions and limitations under the Apache Lic
}, },
// single // single
clear: function() { clear: function(triggerChange) {
var data=this.selection.data("select2-data"); var data=this.selection.data("select2-data");
if (data) { // guard against queued quick consecutive clicks if (data) { // guard against queued quick consecutive clicks
this.opts.element.val(""); this.opts.element.val("");
@ -1755,8 +1755,10 @@ the specific language governing permissions and limitations under the Apache Lic
this.selection.removeData("select2-data"); this.selection.removeData("select2-data");
this.setPlaceholder(); this.setPlaceholder();
this.opts.element.trigger({ type: "removed", val: this.id(data), choice: data }); if (triggerChange !== false){
this.triggerChange({removed:data}); this.opts.element.trigger({ type: "removed", val: this.id(data), choice: data });
this.triggerChange({removed:data});
}
} }
}, },
@ -1946,7 +1948,7 @@ the specific language governing permissions and limitations under the Apache Lic
} }
// val is an id. !val is true for [undefined,null,'',0] - 0 is legal // val is an id. !val is true for [undefined,null,'',0] - 0 is legal
if (!val && val !== 0) { if (!val && val !== 0) {
this.clear(); this.clear(triggerChange);
if (triggerChange) { if (triggerChange) {
this.triggerChange(); this.triggerChange();
} }