From d632e4081da0ec68fd07dd9738ea09ff52a103c4 Mon Sep 17 00:00:00 2001 From: guerler Date: Sun, 4 Jun 2017 12:42:26 -0400 Subject: [PATCH] Remove duplicate selector --- client/galaxy/scripts/mvc/ui/ui-slider.js | 13 ++++++------- static/maps/mvc/ui/ui-slider.js.map | 2 +- static/scripts/mvc/ui/ui-slider.js | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/client/galaxy/scripts/mvc/ui/ui-slider.js b/client/galaxy/scripts/mvc/ui/ui-slider.js index a55a10ae063..9e9b55fc55c 100644 --- a/client/galaxy/scripts/mvc/ui/ui-slider.js +++ b/client/galaxy/scripts/mvc/ui/ui-slider.js @@ -14,9 +14,8 @@ define([ 'utils/utils' ], function( Utils ) { // create new element this.setElement( this._template( this.model.attributes ) ); - this.$text = this.$( '#text' ); - this.$slider = this.$( '#slider' ); - this.$slider_text = this.$( '.ui-form-slider-text' ); + this.$text = this.$( '.ui-form-slider-text' ); + this.$slider = this.$( '.ui-form-slider-element' ); // add text field event var pressed = []; @@ -61,10 +60,10 @@ define([ 'utils/utils' ], function( Utils ) { .on( 'slide', function ( event, ui ) { self.value( ui.value ); }).show(); - this.$slide_text.css( 'width', 'auto' ); + this.$text.css( 'width', 'auto' ); } else { this.$slider.hide(); - this.$slide_text.css( 'width', '100%' ); + this.$text.css( 'width', '100%' ); } }, @@ -92,8 +91,8 @@ define([ 'utils/utils' ], function( Utils ) { /** Slider template */ _template: function( options ) { return '
' + - '' + - '
' + + '' + + '
' + '
'; } }); diff --git a/static/maps/mvc/ui/ui-slider.js.map b/static/maps/mvc/ui/ui-slider.js.map index 06c75ea1ce8..9785b34f6b3 100644 --- a/static/maps/mvc/ui/ui-slider.js.map +++ b/static/maps/mvc/ui/ui-slider.js.map @@ -1 +1 @@ -{"version":3,"file":"ui-slider.js","sources":["../../../src/mvc/ui/ui-slider.js"],"names":["define","Utils","View","Backbone","extend","initialize","options","self","this","model","Model","id","uid","min","max","step","precise","split","value","set","setElement","_template","attributes","$text","$","$slider","$slider_text","pressed","on","val","e","which","get","v","event","preventDefault","indexOf","_isParameter","listenTo","render","useslider","slider","ui","show","$slide_text","css","hide","new_val","undefined","isNaN","Math","onchange","String","substring"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ui-slider.js","sources":["../../../src/mvc/ui/ui-slider.js"],"names":["define","Utils","View","Backbone","extend","initialize","options","self","this","model","Model","id","uid","min","max","step","precise","split","value","set","setElement","_template","attributes","$text","$","$slider","pressed","on","val","e","which","get","v","event","preventDefault","indexOf","_isParameter","listenTo","render","useslider","slider","ui","show","css","hide","new_val","undefined","isNaN","Math","onchange","String","substring"],"mappings":"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"} \ No newline at end of file diff --git a/static/scripts/mvc/ui/ui-slider.js b/static/scripts/mvc/ui/ui-slider.js index 1e25b2aebc9..30f92c5a608 100644 --- a/static/scripts/mvc/ui/ui-slider.js +++ b/static/scripts/mvc/ui/ui-slider.js @@ -1,2 +1,2 @@ -define(["utils/utils"],function(a){var b=Backbone.View.extend({initialize:function(b){var c=this;this.model=b&&b.model||new Backbone.Model({id:a.uid(),min:null,max:null,step:null,precise:!1,split:1e4,value:null}).set(b),this.setElement(this._template(this.model.attributes)),this.$text=this.$("#text"),this.$slider=this.$("#slider"),this.$slider_text=this.$(".ui-form-slider-text");var d=[];this.$text.on("change",function(){c.value($(this).val())}).on("keyup",function(a){d[a.which]=!1,c.model.get("onchange")&&c.model.get("onchange")($(this).val())}).on("keydown",function(a){var b=a.which;d[b]=!0,c.model.get("is_workflow")&&d[16]&&52==b?(c.value("$"),event.preventDefault()):8==b||9==b||13==b||37==b||39==b||b>=48&&57>=b&&!d[16]||b>=96&&105>=b||(190==b||110==b)&&-1==$(this).val().indexOf(".")&&c.model.get("precise")||(189==b||109==b)&&-1==$(this).val().indexOf("-")||c._isParameter($(this).val())||d[91]||d[17]||event.preventDefault()}),this.listenTo(this.model,"change",this.render,this),this.render()},render:function(){var a=this.model.attributes,b=null!==a.max&&null!==a.min&&a.max>a.min,c=a.step;c||(c=a.precise&&b?(a.max-a.min)/a.split:1),b?(this.$slider.slider({min:a.min,max:a.max,step:c}).on("slide",function(a,b){self.value(b.value)}).show(),this.$slide_text.css("width","auto")):(this.$slider.hide(),this.$slide_text.css("width","100%"))},value:function(a){var b=this.model.attributes;return void 0!==a&&(null===a||""===a||this._isParameter(a)||(isNaN(a)&&(a=0),null!==b.max&&(a=Math.min(a,b.max)),null!==b.min&&(a=Math.max(a,b.min))),this.$slider&&this.$slider.slider("value",a),this.$text.val(a),b.onchange&&b.onchange(a)),this.$text.val()},_isParameter:function(a){return this.model.get("is_workflow")&&"$"===String(a).substring(0,1)},_template:function(a){return'
'}});return{View:b}}); +define(["utils/utils"],function(a){var b=Backbone.View.extend({initialize:function(b){var c=this;this.model=b&&b.model||new Backbone.Model({id:a.uid(),min:null,max:null,step:null,precise:!1,split:1e4,value:null}).set(b),this.setElement(this._template(this.model.attributes)),this.$text=this.$(".ui-form-slider-text"),this.$slider=this.$(".ui-form-slider-element");var d=[];this.$text.on("change",function(){c.value($(this).val())}).on("keyup",function(a){d[a.which]=!1,c.model.get("onchange")&&c.model.get("onchange")($(this).val())}).on("keydown",function(a){var b=a.which;d[b]=!0,c.model.get("is_workflow")&&d[16]&&52==b?(c.value("$"),event.preventDefault()):8==b||9==b||13==b||37==b||39==b||b>=48&&57>=b&&!d[16]||b>=96&&105>=b||(190==b||110==b)&&-1==$(this).val().indexOf(".")&&c.model.get("precise")||(189==b||109==b)&&-1==$(this).val().indexOf("-")||c._isParameter($(this).val())||d[91]||d[17]||event.preventDefault()}),this.listenTo(this.model,"change",this.render,this),this.render()},render:function(){var a=this.model.attributes,b=null!==a.max&&null!==a.min&&a.max>a.min,c=a.step;c||(c=a.precise&&b?(a.max-a.min)/a.split:1),b?(this.$slider.slider({min:a.min,max:a.max,step:c}).on("slide",function(a,b){self.value(b.value)}).show(),this.$text.css("width","auto")):(this.$slider.hide(),this.$text.css("width","100%"))},value:function(a){var b=this.model.attributes;return void 0!==a&&(null===a||""===a||this._isParameter(a)||(isNaN(a)&&(a=0),null!==b.max&&(a=Math.min(a,b.max)),null!==b.min&&(a=Math.max(a,b.min))),this.$slider&&this.$slider.slider("value",a),this.$text.val(a),b.onchange&&b.onchange(a)),this.$text.val()},_isParameter:function(a){return this.model.get("is_workflow")&&"$"===String(a).substring(0,1)},_template:function(a){return'
'}});return{View:b}}); //# sourceMappingURL=../../../maps/mvc/ui/ui-slider.js.map \ No newline at end of file