From 3217a209272fdfa18148675fc80bb1532ec2cb6b Mon Sep 17 00:00:00 2001 From: guerler Date: Wed, 20 May 2015 01:52:19 -0400 Subject: [PATCH] Update integer fields while editing --- client/galaxy/scripts/mvc/ui/ui-slider.js | 5 ++--- static/maps/mvc/ui/ui-slider.js.map | 2 +- static/scripts/mvc/ui/ui-slider.js | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/client/galaxy/scripts/mvc/ui/ui-slider.js b/client/galaxy/scripts/mvc/ui/ui-slider.js index caeb2f868e5..96e9217228f 100644 --- a/client/galaxy/scripts/mvc/ui/ui-slider.js +++ b/client/galaxy/scripts/mvc/ui/ui-slider.js @@ -63,6 +63,7 @@ var View = Backbone.View.extend({ var pressed = []; this.$text.on('keyup', function(e) { pressed[e.which] = false; + self.options.onchange && self.options.onchange($(this).val()); }); this.$text.on('keydown', function (e) { var v = e.which; @@ -99,9 +100,7 @@ var View = Backbone.View.extend({ this.$text.val(new_val); // trigger on change event - if (this.options.onchange) { - this.options.onchange(new_val); - } + this.options.onchange && this.options.onchange(new_val); } // return current value diff --git a/static/maps/mvc/ui/ui-slider.js.map b/static/maps/mvc/ui/ui-slider.js.map index 9caca08232f..d99eaf8e5d0 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","optionsDefault","id","uid","min","max","step","precise","split","initialize","options","self","this","merge","setElement","_template","useslider","$slider","$el","find","slider","on","event","ui","value","css","$text","undefined","$","val","pressed","e","which","v","indexOf","preventDefault","new_val","isNaN","Math","onchange"],"mappings":"AACAA,QAAQ,eAAgB,SAASC,GAGjC,GAAIC,GAAOC,SAASD,KAAKE,QAErBC,gBACIC,GAAUL,EAAMM,MAChBC,IAAU,KACVC,IAAU,KACVC,KAAU,KACVC,SAAU,EACVC,MAAU,KAIdC,WAAa,SAASC,GAElB,GAAIC,GAAOC,IAGXA,MAAKF,QAAUb,EAAMgB,MAAMH,EAASE,KAAKX,gBAGzCW,KAAKE,WAAWF,KAAKG,UAAUH,KAAKF,UAGpCE,KAAKI,UAAiC,OAArBJ,KAAKF,QAAQL,KAAqC,OAArBO,KAAKF,QAAQN,KAAgBQ,KAAKF,QAAQL,IAAMO,KAAKF,QAAQN,IAGjF,OAAtBQ,KAAKF,QAAQJ,OACbM,KAAKF,QAAQJ,KAAO,EAChBM,KAAKF,QAAQH,SAAWK,KAAKI,YAC7BJ,KAAKF,QAAQJ,MAAQM,KAAKF,QAAQL,IAAMO,KAAKF,QAAQN,KAAOQ,KAAKF,QAAQF,QAK7EI,KAAKI,WACLJ,KAAKK,QAAUL,KAAKM,IAAIC,KAAK,WAC7BP,KAAKK,QAAQG,OAAOR,KAAKF,SACzBE,KAAKK,QAAQI,GAAG,QAAS,SAAUC,EAAOC,GACtCZ,EAAKa,MAAMD,EAAGC,UAGlBZ,KAAKM,IAAIC,KAAK,wBAAwBM,IAAI,QAAS,QAIvDb,KAAKc,MAAQd,KAAKM,IAAIC,KAAK,SAGAQ,SAAvBf,KAAKF,QAAQc,OACbZ,KAAKY,MAAMZ,KAAKF,QAAQc,OAI5BZ,KAAKc,MAAML,GAAG,SAAU,WACpBV,EAAKa,MAAMI,EAAEhB,MAAMiB,QAIvB,IAAIC,KACJlB,MAAKc,MAAML,GAAG,QAAS,SAASU,GAC5BD,EAAQC,EAAEC,QAAS,IAEvBpB,KAAKc,MAAML,GAAG,UAAW,SAAUU,GAC/B,GAAIE,GAAIF,EAAEC,KACVF,GAAQG,IAAK,EACF,GAALA,GAAe,GAALA,GAAe,IAALA,GAAgB,IAALA,GAAgB,IAALA,GAAYA,GAAK,IAAW,IAALA,GAC1D,KAALA,GAA0C,IAA9BL,EAAEhB,MAAMiB,MAAMK,QAAQ,MAAcvB,EAAKD,QAAQH,SACxD,KAAL0B,GAA0C,IAA9BL,EAAEhB,MAAMiB,MAAMK,QAAQ,MACnCJ,EAAQ,KAAOA,EAAQ,KAC1BR,MAAMa,oBAMlBX,MAAQ,SAAUY,GA4Bd,MA3BgBT,UAAZS,IACgB,OAAZA,GAAgC,KAAZA,IAEhBC,MAAMD,KACNA,EAAU,GAIW,OAArBxB,KAAKF,QAAQL,MACb+B,EAAUE,KAAKlC,IAAIgC,EAASxB,KAAKF,QAAQL,MAEpB,OAArBO,KAAKF,QAAQN,MACbgC,EAAUE,KAAKjC,IAAI+B,EAASxB,KAAKF,QAAQN,OAKjDQ,KAAKK,SAAWL,KAAKK,QAAQG,OAAO,QAASgB,GAC7CxB,KAAKc,MAAMG,IAAIO,GAGXxB,KAAKF,QAAQ6B,UACb3B,KAAKF,QAAQ6B,SAASH,IAKvBxB,KAAKc,MAAMG,OAItBd,UAAW,SAASL,GAChB,MAAQ,YAAcA,EAAQR,GAAK,+IAO3C,QACIJ,KAAOA"} \ 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","optionsDefault","id","uid","min","max","step","precise","split","initialize","options","self","this","merge","setElement","_template","useslider","$slider","$el","find","slider","on","event","ui","value","css","$text","undefined","$","val","pressed","e","which","onchange","v","indexOf","preventDefault","new_val","isNaN","Math"],"mappings":"AACAA,QAAQ,eAAgB,SAASC,GAGjC,GAAIC,GAAOC,SAASD,KAAKE,QAErBC,gBACIC,GAAUL,EAAMM,MAChBC,IAAU,KACVC,IAAU,KACVC,KAAU,KACVC,SAAU,EACVC,MAAU,KAIdC,WAAa,SAASC,GAElB,GAAIC,GAAOC,IAGXA,MAAKF,QAAUb,EAAMgB,MAAMH,EAASE,KAAKX,gBAGzCW,KAAKE,WAAWF,KAAKG,UAAUH,KAAKF,UAGpCE,KAAKI,UAAiC,OAArBJ,KAAKF,QAAQL,KAAqC,OAArBO,KAAKF,QAAQN,KAAgBQ,KAAKF,QAAQL,IAAMO,KAAKF,QAAQN,IAGjF,OAAtBQ,KAAKF,QAAQJ,OACbM,KAAKF,QAAQJ,KAAO,EAChBM,KAAKF,QAAQH,SAAWK,KAAKI,YAC7BJ,KAAKF,QAAQJ,MAAQM,KAAKF,QAAQL,IAAMO,KAAKF,QAAQN,KAAOQ,KAAKF,QAAQF,QAK7EI,KAAKI,WACLJ,KAAKK,QAAUL,KAAKM,IAAIC,KAAK,WAC7BP,KAAKK,QAAQG,OAAOR,KAAKF,SACzBE,KAAKK,QAAQI,GAAG,QAAS,SAAUC,EAAOC,GACtCZ,EAAKa,MAAMD,EAAGC,UAGlBZ,KAAKM,IAAIC,KAAK,wBAAwBM,IAAI,QAAS,QAIvDb,KAAKc,MAAQd,KAAKM,IAAIC,KAAK,SAGAQ,SAAvBf,KAAKF,QAAQc,OACbZ,KAAKY,MAAMZ,KAAKF,QAAQc,OAI5BZ,KAAKc,MAAML,GAAG,SAAU,WACpBV,EAAKa,MAAMI,EAAEhB,MAAMiB,QAIvB,IAAIC,KACJlB,MAAKc,MAAML,GAAG,QAAS,SAASU,GAC5BD,EAAQC,EAAEC,QAAS,EACnBrB,EAAKD,QAAQuB,UAAYtB,EAAKD,QAAQuB,SAASL,EAAEhB,MAAMiB,SAE3DjB,KAAKc,MAAML,GAAG,UAAW,SAAUU,GAC/B,GAAIG,GAAIH,EAAEC,KACVF,GAAQI,IAAK,EACF,GAALA,GAAe,GAALA,GAAe,IAALA,GAAgB,IAALA,GAAgB,IAALA,GAAYA,GAAK,IAAW,IAALA,GAC1D,KAALA,GAA0C,IAA9BN,EAAEhB,MAAMiB,MAAMM,QAAQ,MAAcxB,EAAKD,QAAQH,SACxD,KAAL2B,GAA0C,IAA9BN,EAAEhB,MAAMiB,MAAMM,QAAQ,MACnCL,EAAQ,KAAOA,EAAQ,KAC1BR,MAAMc,oBAMlBZ,MAAQ,SAAUa,GA0Bd,MAzBgBV,UAAZU,IACgB,OAAZA,GAAgC,KAAZA,IAEhBC,MAAMD,KACNA,EAAU,GAIW,OAArBzB,KAAKF,QAAQL,MACbgC,EAAUE,KAAKnC,IAAIiC,EAASzB,KAAKF,QAAQL,MAEpB,OAArBO,KAAKF,QAAQN,MACbiC,EAAUE,KAAKlC,IAAIgC,EAASzB,KAAKF,QAAQN,OAKjDQ,KAAKK,SAAWL,KAAKK,QAAQG,OAAO,QAASiB,GAC7CzB,KAAKc,MAAMG,IAAIQ,GAGfzB,KAAKF,QAAQuB,UAAYrB,KAAKF,QAAQuB,SAASI,IAI5CzB,KAAKc,MAAMG,OAItBd,UAAW,SAASL,GAChB,MAAQ,YAAcA,EAAQR,GAAK,+IAO3C,QACIJ,KAAOA"} \ 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 6268e55aae2..fe2635eb098 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({optionsDefault:{id:a.uid(),min:null,max:null,step:null,precise:!1,split:1e4},initialize:function(b){var c=this;this.options=a.merge(b,this.optionsDefault),this.setElement(this._template(this.options)),this.useslider=null!==this.options.max&&null!==this.options.min&&this.options.max>this.options.min,null===this.options.step&&(this.options.step=1,this.options.precise&&this.useslider&&(this.options.step=(this.options.max-this.options.min)/this.options.split)),this.useslider?(this.$slider=this.$el.find("#slider"),this.$slider.slider(this.options),this.$slider.on("slide",function(a,b){c.value(b.value)})):this.$el.find(".ui-form-slider-text").css("width","100%"),this.$text=this.$el.find("#text"),void 0!==this.options.value&&this.value(this.options.value),this.$text.on("change",function(){c.value($(this).val())});var d=[];this.$text.on("keyup",function(a){d[a.which]=!1}),this.$text.on("keydown",function(a){var b=a.which;d[b]=!0,8==b||9==b||13==b||37==b||39==b||b>=48&&57>=b||190==b&&-1==$(this).val().indexOf(".")&&c.options.precise||189==b&&-1==$(this).val().indexOf("-")||d[91]||d[17]||event.preventDefault()})},value:function(a){return void 0!==a&&(null!==a&&""!==a&&(isNaN(a)&&(a=0),null!==this.options.max&&(a=Math.min(a,this.options.max)),null!==this.options.min&&(a=Math.max(a,this.options.min))),this.$slider&&this.$slider.slider("value",a),this.$text.val(a),this.options.onchange&&this.options.onchange(a)),this.$text.val()},_template:function(a){return'
'}});return{View:b}}); +define(["utils/utils"],function(a){var b=Backbone.View.extend({optionsDefault:{id:a.uid(),min:null,max:null,step:null,precise:!1,split:1e4},initialize:function(b){var c=this;this.options=a.merge(b,this.optionsDefault),this.setElement(this._template(this.options)),this.useslider=null!==this.options.max&&null!==this.options.min&&this.options.max>this.options.min,null===this.options.step&&(this.options.step=1,this.options.precise&&this.useslider&&(this.options.step=(this.options.max-this.options.min)/this.options.split)),this.useslider?(this.$slider=this.$el.find("#slider"),this.$slider.slider(this.options),this.$slider.on("slide",function(a,b){c.value(b.value)})):this.$el.find(".ui-form-slider-text").css("width","100%"),this.$text=this.$el.find("#text"),void 0!==this.options.value&&this.value(this.options.value),this.$text.on("change",function(){c.value($(this).val())});var d=[];this.$text.on("keyup",function(a){d[a.which]=!1,c.options.onchange&&c.options.onchange($(this).val())}),this.$text.on("keydown",function(a){var b=a.which;d[b]=!0,8==b||9==b||13==b||37==b||39==b||b>=48&&57>=b||190==b&&-1==$(this).val().indexOf(".")&&c.options.precise||189==b&&-1==$(this).val().indexOf("-")||d[91]||d[17]||event.preventDefault()})},value:function(a){return void 0!==a&&(null!==a&&""!==a&&(isNaN(a)&&(a=0),null!==this.options.max&&(a=Math.min(a,this.options.max)),null!==this.options.min&&(a=Math.max(a,this.options.min))),this.$slider&&this.$slider.slider("value",a),this.$text.val(a),this.options.onchange&&this.options.onchange(a)),this.$text.val()},_template:function(a){return'
'}});return{View:b}}); //# sourceMappingURL=../../../maps/mvc/ui/ui-slider.js.map \ No newline at end of file