Merge branch 'sd-ready-event' of https://github.com/sd/chosen into sd-sd-ready-event
Conflicts: chosen/chosen.jquery.min.js chosen/chosen.proto.min.js coffee/chosen.proto.coffee
This commit is contained in:
commit
0f89ebef85
|
@ -314,7 +314,10 @@
|
|||
});
|
||||
}
|
||||
this.results_build();
|
||||
return this.set_tab_index();
|
||||
this.set_tab_index();
|
||||
return this.form_field_jq.trigger("liszt:ready", {
|
||||
chosen: this
|
||||
});
|
||||
};
|
||||
Chosen.prototype.register_observers = function() {
|
||||
this.container.mousedown(__bind(function(evt) {
|
||||
|
|
2
chosen/chosen.jquery.min.js
vendored
2
chosen/chosen.jquery.min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -308,7 +308,10 @@
|
|||
});
|
||||
}
|
||||
this.results_build();
|
||||
return this.set_tab_index();
|
||||
this.set_tab_index();
|
||||
return this.form_field.fire("liszt:ready", {
|
||||
chosen: this
|
||||
});
|
||||
};
|
||||
Chosen.prototype.register_observers = function() {
|
||||
this.container.observe("mousedown", __bind(function(evt) {
|
||||
|
|
2
chosen/chosen.proto.min.js
vendored
2
chosen/chosen.proto.min.js
vendored
File diff suppressed because one or more lines are too long
|
@ -70,7 +70,7 @@ class Chosen extends AbstractChosen
|
|||
|
||||
this.results_build()
|
||||
this.set_tab_index()
|
||||
|
||||
@form_field_jq.trigger("liszt:ready", {chosen: this})
|
||||
|
||||
register_observers: ->
|
||||
@container.mousedown (evt) => this.container_mousedown(evt)
|
||||
|
|
|
@ -63,6 +63,7 @@ class Chosen extends AbstractChosen
|
|||
|
||||
this.results_build()
|
||||
this.set_tab_index()
|
||||
@form_field.fire("liszt:ready", {chosen: this})
|
||||
|
||||
register_observers: ->
|
||||
@container.observe "mousedown", (evt) => this.container_mousedown(evt)
|
||||
|
|
Loading…
Reference in a new issue