opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/anuprulez/galaxy into anuprulez-dev

Browse Source 
Conflicts:
	static/scripts/bundled/analysis.bundled.js
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js.map
This commit is contained in:
Martin Cech
2016-05-17 16:32:50 -04:00
parent c2ea4ee526 4d6b8bf2b4
commit a144a32f40
6 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/mvc/ui/ui-select.js
+2 -9
View File
@@ -180,15 +180,8 @@ var View = Backbone.View.extend(
// get index
_getIndex: function(value) {
// search index
for (var key in this.select_data) {
if (this.select_data[key].id == value) {
return key;
}
}
// not found
return -1;
// returns the index of the searched value
_.findIndex(this.select_data, {id: value});
},
// get value
static/maps/mvc/ui/ui-select.js.map
+1 -1
View File
@@ -1 +1 @@
{"version":3,"file":"ui-select.js","sources":["../../../src/mvc/ui/ui-select.js"],"names":["define","Utils","View","Backbone","extend","optionsDefault","css","placeholder","data","value","multiple","minimumInputLength","initialData","initialize","options","this","merge","setElement","_template","container","console","log","append","$el","select_data","_refresh","_setValue","self","onchange","on","new_value","before","_getValue","undefined","after","text","select2","disabled","enable","disable","add","push","id","del","index","_getIndex","splice","remove","update","key","select_opt","containerCssClass","ajax","dropdownCssClass","escapeMarkup","formatResult","formatSelection","initSelection","selected","dropdownAutoWidth","length"],"mappings":"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"}
{"version":3,"file":"ui-select.js","sources":["../../../src/mvc/ui/ui-select.js"],"names":["define","Utils","View","Backbone","extend","optionsDefault","css","placeholder","data","value","multiple","minimumInputLength","initialData","initialize","options","this","merge","setElement","_template","container","console","log","append","$el","select_data","_refresh","_setValue","self","onchange","on","new_value","before","_getValue","undefined","after","text","select2","disabled","enable","disable","add","push","id","del","index","_getIndex","splice","remove","update","key","select_opt","containerCssClass","ajax","dropdownCssClass","escapeMarkup","formatResult","formatSelection","initSelection","selected","dropdownAutoWidth","_","findIndex","length"],"mappings":"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"}
static/scripts/bundled/analysis.bundled.js
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/bundled/analysis.bundled.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/bundled/libs.bundled.js.map
+1 -1
View File
File diff suppressed because one or more lines are too long
static/scripts/mvc/ui/ui-select.js
+1 -1
View File
@@ -1,2 +1,2 @@
define(["utils/utils"],function(a){var b=Backbone.View.extend({optionsDefault:{css:"",placeholder:"No data available",data:[],value:null,multiple:!1,minimumInputLength:0,initialData:""},initialize:function(b){if(this.options=a.merge(b,this.optionsDefault),this.setElement(this._template(this.options)),!this.options.container)return void console.log("ui-select::initialize() : container not specified.");if(this.options.container.append(this.$el),this.select_data=this.options.data,this._refresh(),!this.options.multiple){this.options.value&&this._setValue(this.options.value);var c=this;this.options.onchange&&this.$el.on("change",function(){c.options.onchange(c.value())})}},value:function(a){var b=this._getValue();void 0!==a&&this._setValue(a);var c=this._getValue();return c!=b&&this.options.onchange&&this.options.onchange(c),c},text:function(){return this.$el.select2("data").text},disabled:function(){return!this.$el.select2("enable")},enable:function(){this.$el.select2("enable",!0)},disable:function(){this.$el.select2("enable",!1)},add:function(a){this.select_data.push({id:a.id,text:a.text}),this._refresh()},del:function(a){var b=this._getIndex(a);-1!=b&&(this.select_data.splice(b,1),this._refresh())},remove:function(){this.$el.select2("destroy")},update:function(a){this.select_data=[];for(var b in a.data)this.select_data.push(a.data[b]);this._refresh()},_refresh:function(){if(this.options.multiple){var a={multiple:this.options.multiple,containerCssClass:this.options.css,placeholder:this.options.placeholder,minimumInputLength:this.options.minimumInputLength,ajax:this.options.ajax,dropdownCssClass:this.options.dropdownCssClass,escapeMarkup:this.options.escapeMarkup,formatResult:this.options.formatResult,formatSelection:this.options.formatSelection,initSelection:this.options.initSelection,initialData:this.options.initialData};this.$el.select2(a)}else{var b=this._getValue(),a={data:this.select_data,containerCssClass:this.options.css,placeholder:this.options.placeholder,dropdownAutoWidth:!0};this.$el.select2(a),this._setValue(b)}},_getIndex:function(a){for(var b in this.select_data)if(this.select_data[b].id==a)return b;return-1},_getValue:function(){return this.$el.select2("val")},_setValue:function(a){var b=this._getIndex(a);-1==b&&this.select_data.length>0&&(a=this.select_data[0].id),this.$el.select2("val",a)},_template:function(){return'<input type="hidden" value="'+this.options.initialData+'"/>'}});return{View:b}});
define(["utils/utils"],function(a){var b=Backbone.View.extend({optionsDefault:{css:"",placeholder:"No data available",data:[],value:null,multiple:!1,minimumInputLength:0,initialData:""},initialize:function(b){if(this.options=a.merge(b,this.optionsDefault),this.setElement(this._template(this.options)),!this.options.container)return void console.log("ui-select::initialize() : container not specified.");if(this.options.container.append(this.$el),this.select_data=this.options.data,this._refresh(),!this.options.multiple){this.options.value&&this._setValue(this.options.value);var c=this;this.options.onchange&&this.$el.on("change",function(){c.options.onchange(c.value())})}},value:function(a){var b=this._getValue();void 0!==a&&this._setValue(a);var c=this._getValue();return c!=b&&this.options.onchange&&this.options.onchange(c),c},text:function(){return this.$el.select2("data").text},disabled:function(){return!this.$el.select2("enable")},enable:function(){this.$el.select2("enable",!0)},disable:function(){this.$el.select2("enable",!1)},add:function(a){this.select_data.push({id:a.id,text:a.text}),this._refresh()},del:function(a){var b=this._getIndex(a);-1!=b&&(this.select_data.splice(b,1),this._refresh())},remove:function(){this.$el.select2("destroy")},update:function(a){this.select_data=[];for(var b in a.data)this.select_data.push(a.data[b]);this._refresh()},_refresh:function(){if(this.options.multiple){var a={multiple:this.options.multiple,containerCssClass:this.options.css,placeholder:this.options.placeholder,minimumInputLength:this.options.minimumInputLength,ajax:this.options.ajax,dropdownCssClass:this.options.dropdownCssClass,escapeMarkup:this.options.escapeMarkup,formatResult:this.options.formatResult,formatSelection:this.options.formatSelection,initSelection:this.options.initSelection,initialData:this.options.initialData};this.$el.select2(a)}else{var b=this._getValue(),a={data:this.select_data,containerCssClass:this.options.css,placeholder:this.options.placeholder,dropdownAutoWidth:!0};this.$el.select2(a),this._setValue(b)}},_getIndex:function(a){_.findIndex(this.select_data,{id:a})},_getValue:function(){return this.$el.select2("val")},_setValue:function(a){var b=this._getIndex(a);-1==b&&this.select_data.length>0&&(a=this.select_data[0].id),this.$el.select2("val",a)},_template:function(){return'<input type="hidden" value="'+this.options.initialData+'"/>'}});return{View:b}});
//# sourceMappingURL=../../../maps/mvc/ui/ui-select.js.map