From 8cc27b45d04da7d6298a0b63c0a9c820dc6bed03 Mon Sep 17 00:00:00 2001 From: guerler Date: Thu, 1 Oct 2015 15:23:06 -0400 Subject: [PATCH 1/2] Fix default value for optional select fields --- client/galaxy/scripts/mvc/ui/ui-options.js | 2 +- client/galaxy/scripts/mvc/ui/ui-select-default.js | 2 +- lib/galaxy/tools/parameters/basic.py | 8 ++------ static/maps/mvc/ui/ui-options.js.map | 2 +- static/maps/mvc/ui/ui-select-default.js.map | 2 +- static/scripts/mvc/ui/ui-options.js | 2 +- static/scripts/mvc/ui/ui-select-default.js | 2 +- 7 files changed, 8 insertions(+), 12 deletions(-) diff --git a/client/galaxy/scripts/mvc/ui/ui-options.js b/client/galaxy/scripts/mvc/ui/ui-options.js index 34ad5767183..5df64e06564 100644 --- a/client/galaxy/scripts/mvc/ui/ui-options.js +++ b/client/galaxy/scripts/mvc/ui/ui-options.js @@ -13,7 +13,7 @@ var Base = Backbone.View.extend({ visible : true, data : [], id : Utils.uid(), - error_text : 'No data available.', + error_text : 'No options available.', wait_text : 'Please wait...', multiple : false }); diff --git a/client/galaxy/scripts/mvc/ui/ui-select-default.js b/client/galaxy/scripts/mvc/ui/ui-select-default.js index 6d793d16802..13d403400cb 100644 --- a/client/galaxy/scripts/mvc/ui/ui-select-default.js +++ b/client/galaxy/scripts/mvc/ui/ui-select-default.js @@ -8,7 +8,7 @@ var View = Backbone.View.extend({ id : Utils.uid(), cls : 'ui-select', error_text : 'No data available', - empty_text : 'No selection', + empty_text : 'Nothing selected', visible : true, wait : false, multiple : false, diff --git a/lib/galaxy/tools/parameters/basic.py b/lib/galaxy/tools/parameters/basic.py index d3afd35392a..51cda184de6 100644 --- a/lib/galaxy/tools/parameters/basic.py +++ b/lib/galaxy/tools/parameters/basic.py @@ -816,7 +816,6 @@ class SelectToolParameter( ToolParameter ): self.display = input_source.get( 'display', None ) self.separator = input_source.get( 'separator', ',' ) self.legal_values = set() - # TODO: the tag is deprecated and should be replaced with the tag. self.dynamic_options = input_source.get( "dynamic_options", None ) self.options = input_source.parse_dynamic_options(self) if self.options is not None: @@ -979,17 +978,14 @@ class SelectToolParameter( ToolParameter ): return super( SelectToolParameter, self ).value_from_basic( value, app, ignore_errors=ignore_errors ) def get_initial_value( self, trans, context, history=None ): - # More working around dynamic options for workflow options = list( self.get_options( trans, context ) ) if len(options) == 0 and (trans is None or trans.workflow_building_mode): - # Really the best we can do? return UnvalidatedValue( None ) value = [ optval for _, optval, selected in options if selected ] if len( value ) == 0: - if not self.multiple and options: - # Nothing selected, but not a multiple select, with some values, + if not self.optional and not self.multiple and options: + # Nothing selected, but not optional and not a multiple select, with some values, # so we have to default to something (the HTML form will anyway) - # TODO: deal with optional parameters in a better way value = options[0][1] else: value = None diff --git a/static/maps/mvc/ui/ui-options.js.map b/static/maps/mvc/ui/ui-options.js.map index 10d08e842ac..40d0db21f73 100644 --- a/static/maps/mvc/ui/ui-options.js.map +++ b/static/maps/mvc/ui/ui-options.js.map @@ -1 +1 @@ -{"version":3,"file":"ui-options.js","sources":["../../../src/mvc/ui/ui-options.js"],"names":["define","Utils","Buttons","Base","Backbone","View","extend","initialize","options","self","this","merge","visible","data","id","uid","error_text","wait_text","multiple","setElement","$message","$","$options","_template","$menu","$el","append","all_button","ButtonCheck","onclick","prop","value","trigger","hide","update","undefined","on","onchange","current","_getValue","empty","_templateOptions","key","$option","_templateOption","addClass","tooltip","title","placement","unwait","new_value","Array","i","first","length","_size","exists","val","wait","_messageShow","total","_messageHide","css","show","selected","each","push","validate","text","status","removeClass","html","BaseIcons","pair","type","label","Radio","prototype","call","Checkbox","RadioButton","closest","cls","icon","tmpl"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ui-options.js","sources":["../../../src/mvc/ui/ui-options.js"],"names":["define","Utils","Buttons","Base","Backbone","View","extend","initialize","options","self","this","merge","visible","data","id","uid","error_text","wait_text","multiple","setElement","$message","$","$options","_template","$menu","$el","append","all_button","ButtonCheck","onclick","prop","value","trigger","hide","update","undefined","on","onchange","current","_getValue","empty","_templateOptions","key","$option","_templateOption","addClass","tooltip","title","placement","unwait","new_value","Array","i","first","length","_size","exists","val","wait","_messageShow","total","_messageHide","css","show","selected","each","push","validate","text","status","removeClass","html","BaseIcons","pair","type","label","Radio","prototype","call","Checkbox","RadioButton","closest","cls","icon","tmpl"],"mappings":"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"} \ No newline at end of file diff --git a/static/maps/mvc/ui/ui-select-default.js.map b/static/maps/mvc/ui/ui-select-default.js.map index 98ee217bd08..d66bd5339d8 100644 --- a/static/maps/mvc/ui/ui-select-default.js.map +++ b/static/maps/mvc/ui/ui-select-default.js.map @@ -1 +1 @@ -{"version":3,"file":"ui-select-default.js","sources":["../../../src/mvc/ui/ui-select-default.js"],"names":["define","Utils","Buttons","View","Backbone","extend","optionsDefault","id","uid","cls","error_text","empty_text","visible","wait","multiple","searchable","optional","initialize","options","self","this","merge","setElement","_template","$select","$el","find","$icon","$button","all_button","ButtonCheck","onclick","new_value","value","_availableOptions","trigger","prepend","addClass","prop","remove","update","data","undefined","hide","show","on","onchange","exists","val","select2","current","_getValue","$","isArray","length","_size","first","text","unwait","removeClass","disabled","is","enable","disable","append","_templateOption","label","key","off","setOnChange","callback","validate","available","each","i","e","push","attr"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ui-select-default.js","sources":["../../../src/mvc/ui/ui-select-default.js"],"names":["define","Utils","Buttons","View","Backbone","extend","optionsDefault","id","uid","cls","error_text","empty_text","visible","wait","multiple","searchable","optional","initialize","options","self","this","merge","setElement","_template","$select","$el","find","$icon","$button","all_button","ButtonCheck","onclick","new_value","value","_availableOptions","trigger","prepend","addClass","prop","remove","update","data","undefined","hide","show","on","onchange","exists","val","select2","current","_getValue","$","isArray","length","_size","first","text","unwait","removeClass","disabled","is","enable","disable","append","_templateOption","label","key","off","setOnChange","callback","validate","available","each","i","e","push","attr"],"mappings":"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"} \ No newline at end of file diff --git a/static/scripts/mvc/ui/ui-options.js b/static/scripts/mvc/ui/ui-options.js index 28e3be67f2e..888baac02f2 100644 --- a/static/scripts/mvc/ui/ui-options.js +++ b/static/scripts/mvc/ui/ui-options.js @@ -1,2 +1,2 @@ -define(["utils/utils","mvc/ui/ui-buttons"],function(a,b){var c=Backbone.View.extend({initialize:function(c){var d=this;this.options=a.merge(c,{visible:!0,data:[],id:a.uid(),error_text:"No data available.",wait_text:"Please wait...",multiple:!1}),this.setElement('
'),this.$message=$("
"),this.$options=$(this._template(c)),this.$menu=$('
'),this.$el.append(this.$message),this.$el.append(this.$menu),this.$el.append(this.$options),this.options.multiple&&(this.all_button=new b.ButtonCheck({onclick:function(){d.$("input").prop("checked",0!==d.all_button.value()),d.trigger("change")}}),this.$menu.append(this.all_button.$el)),this.options.visible||this.$el.hide(),this.update(this.options.data),void 0!==this.options.value&&this.value(this.options.value),this.on("change",function(){this.options.onchange&&this.options.onchange(this.value())})},update:function(a){var b=this._getValue();if(this.$options.empty(),this._templateOptions)this.$options.append(this._templateOptions(a));else for(var c in a){var d=$(this._templateOption(a[c]));d.addClass("ui-option"),d.tooltip({title:a[c].tooltip,placement:"bottom"}),this.$options.append(d)}var e=this;this.$("input").on("change",function(){e.value(e._getValue()),e.trigger("change")}),this.value(b),this.unwait()},value:function(a){if(void 0!==a&&(this.$("input").prop("checked",!1),null!==a)){a instanceof Array||(a=[a]);for(var b in a)this.$('input[value="'+a[b]+'"]').first().prop("checked",!0)}var c=this._getValue();if(this.all_button){var d=c;d=d instanceof Array?d.length:0,this.all_button.value(d,this._size())}return c},exists:function(a){if(void 0!==a){a instanceof Array||(a=[a]);for(var b in a)if(this.$('input[value="'+a[b]+'"]').length>0)return!0}return!1},first:function(){var a=this.$("input").first();return a.length>0?a.val():null},wait:function(){0==this._size()&&(this._messageShow(this.options.wait_text,"info"),this.$options.hide(),this.$menu.hide())},unwait:function(){var a=this._size();0==a?(this._messageShow(this.options.error_text,"danger"),this.$options.hide(),this.$menu.hide()):(this._messageHide(),this.$options.css("display","inline-block"),this.$menu.show())},_getValue:function(){var b=[];return this.$(":checked").each(function(){b.push($(this).val())}),a.validate(b)?this.options.multiple?b:b[0]:null},_size:function(){return this.$(".ui-option").length},_messageShow:function(a,b){this.$message.show(),this.$message.removeClass(),this.$message.addClass("ui-message alert alert-"+b),this.$message.html(a)},_messageHide:function(){this.$message.hide()},_template:function(){return'
'}}),d=c.extend({_templateOption:function(b){var c=a.uid();return'
"}}),e={};e.View=d.extend({initialize:function(a){a.type="radio",d.prototype.initialize.call(this,a)}});var f={};f.View=d.extend({initialize:function(a){a.multiple=!0,a.type="checkbox",d.prototype.initialize.call(this,a)}});var g={};return g.View=c.extend({initialize:function(a){c.prototype.initialize.call(this,a)},value:function(a){return void 0!==a&&(this.$("input").prop("checked",!1),this.$("label").removeClass("active"),this.$('[value="'+a+'"]').prop("checked",!0).closest("label").addClass("active")),this._getValue()},_templateOption:function(a){var b="fa "+a.icon;a.label||(b+=" no-padding");var c='"},_template:function(){return'
'}}),{Base:c,BaseIcons:d,Radio:e,RadioButton:g,Checkbox:f}}); +define(["utils/utils","mvc/ui/ui-buttons"],function(a,b){var c=Backbone.View.extend({initialize:function(c){var d=this;this.options=a.merge(c,{visible:!0,data:[],id:a.uid(),error_text:"No options available.",wait_text:"Please wait...",multiple:!1}),this.setElement('
'),this.$message=$("
"),this.$options=$(this._template(c)),this.$menu=$('
'),this.$el.append(this.$message),this.$el.append(this.$menu),this.$el.append(this.$options),this.options.multiple&&(this.all_button=new b.ButtonCheck({onclick:function(){d.$("input").prop("checked",0!==d.all_button.value()),d.trigger("change")}}),this.$menu.append(this.all_button.$el)),this.options.visible||this.$el.hide(),this.update(this.options.data),void 0!==this.options.value&&this.value(this.options.value),this.on("change",function(){this.options.onchange&&this.options.onchange(this.value())})},update:function(a){var b=this._getValue();if(this.$options.empty(),this._templateOptions)this.$options.append(this._templateOptions(a));else for(var c in a){var d=$(this._templateOption(a[c]));d.addClass("ui-option"),d.tooltip({title:a[c].tooltip,placement:"bottom"}),this.$options.append(d)}var e=this;this.$("input").on("change",function(){e.value(e._getValue()),e.trigger("change")}),this.value(b),this.unwait()},value:function(a){if(void 0!==a&&(this.$("input").prop("checked",!1),null!==a)){a instanceof Array||(a=[a]);for(var b in a)this.$('input[value="'+a[b]+'"]').first().prop("checked",!0)}var c=this._getValue();if(this.all_button){var d=c;d=d instanceof Array?d.length:0,this.all_button.value(d,this._size())}return c},exists:function(a){if(void 0!==a){a instanceof Array||(a=[a]);for(var b in a)if(this.$('input[value="'+a[b]+'"]').length>0)return!0}return!1},first:function(){var a=this.$("input").first();return a.length>0?a.val():null},wait:function(){0==this._size()&&(this._messageShow(this.options.wait_text,"info"),this.$options.hide(),this.$menu.hide())},unwait:function(){var a=this._size();0==a?(this._messageShow(this.options.error_text,"danger"),this.$options.hide(),this.$menu.hide()):(this._messageHide(),this.$options.css("display","inline-block"),this.$menu.show())},_getValue:function(){var b=[];return this.$(":checked").each(function(){b.push($(this).val())}),a.validate(b)?this.options.multiple?b:b[0]:null},_size:function(){return this.$(".ui-option").length},_messageShow:function(a,b){this.$message.show(),this.$message.removeClass(),this.$message.addClass("ui-message alert alert-"+b),this.$message.html(a)},_messageHide:function(){this.$message.hide()},_template:function(){return'
'}}),d=c.extend({_templateOption:function(b){var c=a.uid();return'
"}}),e={};e.View=d.extend({initialize:function(a){a.type="radio",d.prototype.initialize.call(this,a)}});var f={};f.View=d.extend({initialize:function(a){a.multiple=!0,a.type="checkbox",d.prototype.initialize.call(this,a)}});var g={};return g.View=c.extend({initialize:function(a){c.prototype.initialize.call(this,a)},value:function(a){return void 0!==a&&(this.$("input").prop("checked",!1),this.$("label").removeClass("active"),this.$('[value="'+a+'"]').prop("checked",!0).closest("label").addClass("active")),this._getValue()},_templateOption:function(a){var b="fa "+a.icon;a.label||(b+=" no-padding");var c='"},_template:function(){return'
'}}),{Base:c,BaseIcons:d,Radio:e,RadioButton:g,Checkbox:f}}); //# sourceMappingURL=../../../maps/mvc/ui/ui-options.js.map \ No newline at end of file diff --git a/static/scripts/mvc/ui/ui-select-default.js b/static/scripts/mvc/ui/ui-select-default.js index 1f1f6b6f90f..7571e61cfaf 100644 --- a/static/scripts/mvc/ui/ui-select-default.js +++ b/static/scripts/mvc/ui/ui-select-default.js @@ -1,2 +1,2 @@ -define(["utils/utils","mvc/ui/ui-buttons"],function(a,b){var c=Backbone.View.extend({optionsDefault:{id:a.uid(),cls:"ui-select",error_text:"No data available",empty_text:"No selection",visible:!0,wait:!1,multiple:!1,searchable:!0,optional:!1},initialize:function(c){var d=this;this.options=a.merge(c,this.optionsDefault),this.setElement(this._template(this.options)),this.$select=this.$el.find(".select"),this.$icon=this.$el.find(".icon"),this.$button=this.$el.find(".button"),this.options.multiple&&(this.options.searchable&&(this.all_button=new b.ButtonCheck({onclick:function(){var a=[];0!==d.all_button.value()&&(a=d._availableOptions()),d.value(a),d.trigger("change")}}),this.$el.prepend(this.all_button.$el)),this.$el.addClass("ui-select-multiple"),this.$select.prop("multiple",!0),this.$button.remove()),this.update(this.options.data),void 0!==this.options.value&&this.value(this.options.value),this.options.visible||this.hide(),this.options.wait?this.wait():this.show(),this.$select.on("change",function(){d.trigger("change")}),this.on("change",function(){d.options.onchange&&d.options.onchange(this.value())})},value:function(a){void 0!==a&&(null===a&&(a="__null__"),(this.exists(a)||this.options.multiple)&&(this.$select.val(a),this.$select.select2&&this.$select.select2("val",a)));var b=this._getValue();return this.all_button&&this.all_button.value($.isArray(b)&&b.length||0,this._size()),b},first:function(){var a=this.$select.find("option").first();return a.length>0?a.val():null},text:function(){return this.$select.find("option:selected").text()},show:function(){this.unwait(),this.$select.show(),this.$el.show()},hide:function(){this.$el.hide()},wait:function(){this.$icon.removeClass(),this.$icon.addClass("fa fa-spinner fa-spin")},unwait:function(){this.$icon.removeClass(),this.$icon.addClass("fa fa-caret-down")},disabled:function(){return this.$select.is(":disabled")},enable:function(){this.$select.prop("disabled",!1)},disable:function(){this.$select.prop("disabled",!0)},update:function(a){var b=this._getValue();this.$select.find("option").remove(),!this.options.multiple&&this.options.optional&&this.$select.append(this._templateOption({value:"__null__",label:this.options.empty_text}));for(var c in a)this.$select.append(this._templateOption(a[c]));0==this._size()?(this.disable(),this.$select.append(this._templateOption({value:"__null__",label:this.options.error_text}))):this.enable(),this.options.searchable&&(this.$select.select2("destroy"),this.$select.select2(),this.$(".select2-container .select2-search input").off("blur")),this.value(b),null!==this._getValue()||this.options.multiple&&this.options.optional||this.value(this.first())},setOnChange:function(a){this.options.onchange=a},exists:function(a){return this.$select.find('option[value="'+a+'"]').length>0},_getValue:function(){var b=this.$select.val();return a.validate(b)?b:null},_availableOptions:function(){var a=[];return this.$select.find("option").each(function(b,c){a.push($(c).attr("value"))}),a},_size:function(){return this.$select.find("option").length},_templateOption:function(a){return'"},_template:function(a){return'
'}});return{View:c}}); //# sourceMappingURL=../../../maps/mvc/ui/ui-select-default.js.map \ No newline at end of file From df74d2651b32f110137359d4d9b41c7c581846fd Mon Sep 17 00:00:00 2001 From: guerler Date: Thu, 1 Oct 2015 15:28:16 -0400 Subject: [PATCH 2/2] Fix label text --- client/galaxy/scripts/mvc/ui/ui-select-default.js | 2 +- static/maps/mvc/ui/ui-select-default.js.map | 2 +- static/scripts/mvc/ui/ui-select-default.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/galaxy/scripts/mvc/ui/ui-select-default.js b/client/galaxy/scripts/mvc/ui/ui-select-default.js index 13d403400cb..0b4f9c930ab 100644 --- a/client/galaxy/scripts/mvc/ui/ui-select-default.js +++ b/client/galaxy/scripts/mvc/ui/ui-select-default.js @@ -7,7 +7,7 @@ var View = Backbone.View.extend({ optionsDefault: { id : Utils.uid(), cls : 'ui-select', - error_text : 'No data available', + error_text : 'No options available', empty_text : 'Nothing selected', visible : true, wait : false, diff --git a/static/maps/mvc/ui/ui-select-default.js.map b/static/maps/mvc/ui/ui-select-default.js.map index d66bd5339d8..37519334c9f 100644 --- a/static/maps/mvc/ui/ui-select-default.js.map +++ b/static/maps/mvc/ui/ui-select-default.js.map @@ -1 +1 @@ -{"version":3,"file":"ui-select-default.js","sources":["../../../src/mvc/ui/ui-select-default.js"],"names":["define","Utils","Buttons","View","Backbone","extend","optionsDefault","id","uid","cls","error_text","empty_text","visible","wait","multiple","searchable","optional","initialize","options","self","this","merge","setElement","_template","$select","$el","find","$icon","$button","all_button","ButtonCheck","onclick","new_value","value","_availableOptions","trigger","prepend","addClass","prop","remove","update","data","undefined","hide","show","on","onchange","exists","val","select2","current","_getValue","$","isArray","length","_size","first","text","unwait","removeClass","disabled","is","enable","disable","append","_templateOption","label","key","off","setOnChange","callback","validate","available","each","i","e","push","attr"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ui-select-default.js","sources":["../../../src/mvc/ui/ui-select-default.js"],"names":["define","Utils","Buttons","View","Backbone","extend","optionsDefault","id","uid","cls","error_text","empty_text","visible","wait","multiple","searchable","optional","initialize","options","self","this","merge","setElement","_template","$select","$el","find","$icon","$button","all_button","ButtonCheck","onclick","new_value","value","_availableOptions","trigger","prepend","addClass","prop","remove","update","data","undefined","hide","show","on","onchange","exists","val","select2","current","_getValue","$","isArray","length","_size","first","text","unwait","removeClass","disabled","is","enable","disable","append","_templateOption","label","key","off","setOnChange","callback","validate","available","each","i","e","push","attr"],"mappings":"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"} \ No newline at end of file diff --git a/static/scripts/mvc/ui/ui-select-default.js b/static/scripts/mvc/ui/ui-select-default.js index 7571e61cfaf..540908329d3 100644 --- a/static/scripts/mvc/ui/ui-select-default.js +++ b/static/scripts/mvc/ui/ui-select-default.js @@ -1,2 +1,2 @@ -define(["utils/utils","mvc/ui/ui-buttons"],function(a,b){var c=Backbone.View.extend({optionsDefault:{id:a.uid(),cls:"ui-select",error_text:"No data available",empty_text:"Nothing selected",visible:!0,wait:!1,multiple:!1,searchable:!0,optional:!1},initialize:function(c){var d=this;this.options=a.merge(c,this.optionsDefault),this.setElement(this._template(this.options)),this.$select=this.$el.find(".select"),this.$icon=this.$el.find(".icon"),this.$button=this.$el.find(".button"),this.options.multiple&&(this.options.searchable&&(this.all_button=new b.ButtonCheck({onclick:function(){var a=[];0!==d.all_button.value()&&(a=d._availableOptions()),d.value(a),d.trigger("change")}}),this.$el.prepend(this.all_button.$el)),this.$el.addClass("ui-select-multiple"),this.$select.prop("multiple",!0),this.$button.remove()),this.update(this.options.data),void 0!==this.options.value&&this.value(this.options.value),this.options.visible||this.hide(),this.options.wait?this.wait():this.show(),this.$select.on("change",function(){d.trigger("change")}),this.on("change",function(){d.options.onchange&&d.options.onchange(this.value())})},value:function(a){void 0!==a&&(null===a&&(a="__null__"),(this.exists(a)||this.options.multiple)&&(this.$select.val(a),this.$select.select2&&this.$select.select2("val",a)));var b=this._getValue();return this.all_button&&this.all_button.value($.isArray(b)&&b.length||0,this._size()),b},first:function(){var a=this.$select.find("option").first();return a.length>0?a.val():null},text:function(){return this.$select.find("option:selected").text()},show:function(){this.unwait(),this.$select.show(),this.$el.show()},hide:function(){this.$el.hide()},wait:function(){this.$icon.removeClass(),this.$icon.addClass("fa fa-spinner fa-spin")},unwait:function(){this.$icon.removeClass(),this.$icon.addClass("fa fa-caret-down")},disabled:function(){return this.$select.is(":disabled")},enable:function(){this.$select.prop("disabled",!1)},disable:function(){this.$select.prop("disabled",!0)},update:function(a){var b=this._getValue();this.$select.find("option").remove(),!this.options.multiple&&this.options.optional&&this.$select.append(this._templateOption({value:"__null__",label:this.options.empty_text}));for(var c in a)this.$select.append(this._templateOption(a[c]));0==this._size()?(this.disable(),this.$select.append(this._templateOption({value:"__null__",label:this.options.error_text}))):this.enable(),this.options.searchable&&(this.$select.select2("destroy"),this.$select.select2(),this.$(".select2-container .select2-search input").off("blur")),this.value(b),null!==this._getValue()||this.options.multiple&&this.options.optional||this.value(this.first())},setOnChange:function(a){this.options.onchange=a},exists:function(a){return this.$select.find('option[value="'+a+'"]').length>0},_getValue:function(){var b=this.$select.val();return a.validate(b)?b:null},_availableOptions:function(){var a=[];return this.$select.find("option").each(function(b,c){a.push($(c).attr("value"))}),a},_size:function(){return this.$select.find("option").length},_templateOption:function(a){return'"},_template:function(a){return'
'}});return{View:c}}); //# sourceMappingURL=../../../maps/mvc/ui/ui-select-default.js.map \ No newline at end of file