Merge remote-tracking branch 'origin/next' into next

This commit is contained in:
Leo Horie 2016-06-06 09:22:20 -04:00
commit 9f91858843

View file

@ -38,7 +38,7 @@ var Select2 = {
if (!isInitialized) { if (!isInitialized) {
el.select2() el.select2()
.on("change", function(e) { .on("change", function(e) {
var id = el.select2("val"); var id = el.val();
m.startComputation(); m.startComputation();
//Set the value to the selected option //Set the value to the selected option
ctrl.data.map(function(d){ ctrl.data.map(function(d){
@ -48,7 +48,7 @@ var Select2 = {
}); });
if (typeof ctrl.onchange == "function"){ if (typeof ctrl.onchange == "function"){
ctrl.onchange(el.select2("val")); ctrl.onchange(el.val());
} }
m.endComputation(); m.endComputation();
}); });