From e05036a6a02c396c207c9ea80dc056a58c9f7f08 Mon Sep 17 00:00:00 2001 From: guerler Date: Tue, 4 Apr 2017 21:37:54 -0400 Subject: [PATCH] Avoid flickering due to bubbling events from children without masking div --- .../scripts/mvc/ui/ui-select-content.js | 21 ++++++++++++++++--- static/maps/mvc/ui/ui-select-content.js.map | 2 +- static/scripts/bundled/analysis.bundled.js | 6 +++--- .../scripts/bundled/analysis.bundled.js.map | 2 +- static/scripts/bundled/libs.bundled.js.map | 2 +- static/scripts/mvc/ui/ui-select-content.js | 2 +- static/style/blue/base.css | 2 +- 7 files changed, 26 insertions(+), 11 deletions(-) diff --git a/client/galaxy/scripts/mvc/ui/ui-select-content.js b/client/galaxy/scripts/mvc/ui/ui-select-content.js index 9d6c1bce17b..c0fee7add3b 100644 --- a/client/galaxy/scripts/mvc/ui/ui-select-content.js +++ b/client/galaxy/scripts/mvc/ui/ui-select-content.js @@ -56,9 +56,24 @@ var View = Backbone.View.extend({ }; // add drag-drop event handlers - this.$el.on( 'dragover', function( e ) { e.preventDefault(); self.$el.addClass( 'ui-dragover' ); }) - .on( 'dragleave', function( e ) { e.preventDefault(); self.$el.removeClass( 'ui-dragover' ); }) - .on( 'drop', function( e ) { self._handleDrop( e ); self.$el.removeClass( 'ui-dragover' ); }); + this.$el.on( 'dragenter', function( e ) { + e.preventDefault(); + this.lastenter = e.target; + self.$el.addClass( 'ui-dragover' ); + }) + .on( 'dragover', function( e ) { + e.preventDefault(); + }) + .on( 'dragleave', function( e ) { + e.preventDefault(); + if ( this.lastenter === e.target ) { + self.$el.removeClass( 'ui-dragover' ); + } + }) + .on( 'drop', function( e ) { + self._handleDrop( e ); + self.$el.removeClass( 'ui-dragover' ); + }); // track current history elements this.history = {}; diff --git a/static/maps/mvc/ui/ui-select-content.js.map b/static/maps/mvc/ui/ui-select-content.js.map index 90f8957ec14..f76d15c20bf 100644 --- a/static/maps/mvc/ui/ui-select-content.js.map +++ b/static/maps/mvc/ui/ui-select-content.js.map @@ -1 +1 @@ -{"version":3,"file":"ui-select-content.js","sources":["../../../src/mvc/ui/ui-select-content.js"],"names":["define","Utils","Ui","Select","Batch","DISABLED","ENABLED","LINKED","Configurations","data","src","icon","tooltip","multiple","batch","data_multiple","data_collection","workflow_data","workflow_data_multiple","workflow_data_collection","module_data","module_data_collection","View","Backbone","extend","initialize","options","self","this","model","Model","src_labels","hda","hdca","pagelimit","statustimer","set","setElement","$","addClass","button_product","RadioButton","value","$batch_div","append","html","$batch","linked","clone","enabled","$el","css","on","e","preventDefault","removeClass","_handleDrop","history","listenTo","_changeData","_changeWait","_changeCurrent","_changeValue","_changeType","render","onchange","wait","unwait","update","new_value","undefined","current","get","config","id_list","fields","isArray","length","result","_batch","values","i","details","Galaxy","emit","debug","push","sort","a","b","hid","_","each","field","show","$batchfield","batchmode","button_type","hide","config_id","String","extensions","textify","button_data","c","optional","searchable","selectall","error_text","trigger","empty","button_width","Math","max","margin-left","select_options","items","item","keep","label","name","id","tags","add","list","indexOf","ev","drop_data","JSON","parse","dataTransfer","getData","new_id","new_src","history_content_type","findWhere","_handleDropStatus","status","setTimeout","map_over_type"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"ui-select-content.js","sources":["../../../src/mvc/ui/ui-select-content.js"],"names":["define","Utils","Ui","Select","Batch","DISABLED","ENABLED","LINKED","Configurations","data","src","icon","tooltip","multiple","batch","data_multiple","data_collection","workflow_data","workflow_data_multiple","workflow_data_collection","module_data","module_data_collection","View","Backbone","extend","initialize","options","self","this","model","Model","src_labels","hda","hdca","pagelimit","statustimer","set","setElement","$","addClass","button_product","RadioButton","value","$batch_div","append","html","$batch","linked","clone","enabled","$el","css","on","e","preventDefault","lastenter","target","removeClass","_handleDrop","history","listenTo","_changeData","_changeWait","_changeCurrent","_changeValue","_changeType","render","onchange","wait","unwait","update","new_value","undefined","current","get","config","id_list","fields","isArray","length","result","_batch","values","i","details","Galaxy","emit","debug","push","sort","a","b","hid","_","each","field","show","$batchfield","batchmode","button_type","hide","config_id","String","extensions","textify","button_data","c","optional","searchable","selectall","error_text","trigger","empty","button_width","Math","max","margin-left","select_options","items","item","keep","label","name","id","tags","add","list","indexOf","ev","drop_data","JSON","parse","dataTransfer","getData","new_id","new_src","history_content_type","findWhere","_handleDropStatus","status","setTimeout","map_over_type"],"mappings":"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"} \ No newline at end of file diff --git a/static/scripts/bundled/analysis.bundled.js b/static/scripts/bundled/analysis.bundled.js index 7160f5a96f4..6661e62d164 100644 --- a/static/scripts/bundled/analysis.bundled.js +++ b/static/scripts/bundled/analysis.bundled.js @@ -2,9 +2,9 @@ webpackJsonp([3,1],[function(e,t,i){(function(e,t){var n=i(1),s=n,o=i(60).Galaxy d(h)}).keyup(function(e){27===e.keyCode?t(this).trigger("blur"):13===e.keyCode&&d(t(this).val()),e.stopPropagation()}),r.text(""),r.append(l),c&&r.append(c),l.focus(),l.select(),a.stopPropagation()}}),a&&r.attr("title",a).tooltip(),r}})},function(e,t,i){var n;(function(s,o){n=function(){function e(e){e+="";for(var t=/(\d+)(\d{3})/;t.test(e);)e=e.replace(t,"$1,$2");return e}var t=function(e){return"promise"in e},i=s.Model.extend({defaults:{ajax_settings:{},interval:1e3,success_fn:function(e){return!0}},go:function(){var e=o.Deferred(),t=this,i=t.get("ajax_settings"),n=t.get("success_fn"),s=t.get("interval"),a=function(){o.ajax(i).success(function(t){n(t)?e.resolve(t):setTimeout(a,s)})};return a(),e}}),n=function(e){e||(e="#ffffff"),"string"==typeof e&&(e=[e]);for(var t=0;t>16,s=(65280&i)>>8,o=255&i,d=p(n,s,o),f=!0,t=0;t>16,l=(65280&a)>>8,c=255&a,h=p(r,l,c),u=g(n,s,o,r,l,c),Math.abs(d-h)<40||u<200){f=!1;break}m++}while(!f&&m<=10);return"#"+(16777216+i).toString(16).substr(1,6)};return{commatize:e,is_deferred:t,ServerStateDeferred:i,get_random_color:n}}.call(t,i,t,e),!(void 0!==n&&(e.exports=n))}).call(t,i(3),i(1))},function(e,t,i){var n,s;(function(o,a){n=[i(30),i(6),i(5)],s=function(e,t,i){e=e||window.BibtexParser;var n="citation",s=o.Model.extend(t.LoggableMixin).extend({_logNamespace:n,defaults:{content:""},initialize:function(){var t;try{t=e(this.attributes.content)}catch(e){return}if(t.errors.length){var i=t.errors.reduce(function(e,t){return e+"; "+t});this.log("Error parsing bibtex: "+i)}if(this._fields={},this.entry=a.first(t.entries),this.entry){var n=this.entry.Fields;for(var s in n){var o=n[s],r=s.toLowerCase();this._fields[r]=o}}},entryType:function(){return this.entry?this.entry.EntryType:void 0},fields:function(){return this._fields}}),r=o.Collection.extend(t.LoggableMixin).extend({_logNamespace:n,urlRoot:Galaxy.root+"api",partial:!0,model:s}),l=r.extend({url:function(){return this.urlRoot+"/histories/"+this.history_id+"/citations"}}),c=r.extend({url:function(){return this.urlRoot+"/tools/"+this.tool_id+"/citations"},partial:!1});return{Citation:s,HistoryCitationCollection:l,ToolCitationCollection:c}}.apply(t,n),!(void 0!==s&&(e.exports=s))}).call(t,i(3),i(2))},function(e,t,i){var n,s;(function(o,a){n=[i(4),i(9),i(7)],s=function(e,t,i){var n=o.View.extend({initialize:function(e){var n=this;this.options=e,this.name=e.name||"element",this.multiple=e.multiple||!1,this.message=new i.Message,this.portlet=new t.View({cls:"ui-portlet-section"}),this.select=new i.Select.View({optional:e.optional}),this.button=new i.ButtonIcon({icon:"fa fa-sign-in",floating:"left",tooltip:"Insert new "+this.name,onclick:function(){n.add({id:n.select.value(),name:n.select.text()})}}),this.setElement(this._template(e)),this.$(".ui-list-message").append(this.message.$el),this.$(".ui-list-portlet").append(this.portlet.$el),this.$(".ui-list-button").append(this.button.$el),this.$(".ui-list-select").append(this.select.$el)},value:function(e){if(void 0!==e){if(this.portlet.empty(),a.isArray(e))for(var t in e){var i=e[t],n=null,s=null;"string"!=a.type(i)?(n=i.id,s=i.name):n=s=i,null!=n&&this.add({id:n,name:s})}this._refresh()}var o=[];return this.$(".ui-list-id").each(function(){o.push({id:a(this).prop("id"),name:a(this).find(".ui-list-name").html()})}),0==o.length?null:o},add:function(t){var i=this;if(0===this.$('[id="'+t.id+'"]').length)if(e.isEmpty(t.id))this.message.update({message:"Please select a valid "+this.name+".",status:"danger"});else{var n=a(this._templateRow({id:t.id,name:t.name}));n.on("click",function(){n.remove(),i._refresh()}),n.on("mouseover",function(){n.addClass("portlet-highlight")}),n.on("mouseout",function(){n.removeClass("portlet-highlight")}),this.portlet.append(n),this._refresh()}else this.message.update({message:"This "+this.name+" is already in the list."})},update:function(e){this.select.update(e)},_refresh:function(){this.$(".ui-list-id").length>0?(!this.multiple&&this.button.disable(),this.$(".ui-list-portlet").show()):(this.button.enable(),this.$(".ui-list-portlet").hide()),this.options.onchange&&this.options.onchange()},_template:function(e){return'
'},_templateRow:function(e){return'
'+e.name+"
"}});return{View:n}}.apply(t,n),!(void 0!==s&&(e.exports=s))}).call(t,i(3),i(1))},function(e,t,i){var n,s;(function(o,a,r){n=[i(4),i(13)],s=function(e,t){var i=o.View.extend({initialize:function(t){var i=this;this.model=t&&t.model||new o.Model({visible:!0,data:[],id:e.uid(),error_text:"No options available.",wait_text:"Please wait...",multiple:!1,optional:!1,onchange:function(){}}).set(t),this.listenTo(this.model,"change:value",this._changeValue,this),this.listenTo(this.model,"change:wait",this._changeWait,this),this.listenTo(this.model,"change:data",this._changeData,this),this.listenTo(this.model,"change:visible",this._changeVisible,this),this.on("change",function(){i.model.get("onchange")(i.value())}),this.render()},render:function(){var e=this;this.$el.empty().removeClass().addClass("ui-options").append(this.$message=a("
")).append(this.$menu=a("
").addClass("ui-options-menu")).append(this.$options=a(this._template())),this.all_button=null,this.model.get("multiple")&&(this.all_button=new t.ButtonCheck({onclick:function(){e.$("input").prop("checked",0!==e.all_button.value()),e.value(e._getValue()),e.trigger("change")}}),this.$menu.append(this.all_button.$el)),this._changeData(),this._changeWait(),this._changeVisible()},update:function(e){this.model.set("data",e)},_changeData:function(){var e=this;this.$options.empty(),this._templateOptions?this.$options.append(this._templateOptions(this.model.get("data"))):r.each(this.model.get("data"),function(t){e.$options.append(a(e._templateOption(t)).addClass("ui-option").tooltip({title:t.tooltip,placement:"bottom"}))});var e=this;this.$("input").on("change",function(){e.value(e._getValue()),e.trigger("change")}),this._changeValue(),this._changeWait()},_changeVisible:function(){this.$el[this.model.get("visible")?"show":"hide"]()},_changeWait:function(){this.model.get("wait")?0===this.length()&&(this._messageShow(this.model.get("wait_text"),"info"),this.$options.hide(),this.$menu.hide()):0===this.length()?(this._messageShow(this.model.get("error_text"),"danger"),this.$options.hide(),this.$menu.hide()):(this.$message.hide(),this.$options.css("display","inline-block"),this.$menu.show())},_changeValue:function(){this._setValue(this.model.get("value")),null!==this._getValue()||this.model.get("multiple")||this.model.get("optional")||this._setValue(this.first()),this.all_button&&this.all_button.value(a.isArray(this._getValue())?this._getValue().length:0,this.length())},value:function(e){return void 0!==e&&this.model.set("value",e),this._getValue()},first:function(){var e=this.$("input").first();return e.length>0?e.val():null},wait:function(){this.model.set("wait",!0)},unwait:function(){this.model.set("wait",!1)},length:function(){return this.$(".ui-option").length},_setValue:function(e){var t=this;if(void 0!==e&&(this.$("input").prop("checked",!1),null!==e)){var i=a.isArray(e)?e:[e];r.each(i,function(e){t.$('input[value="'+e+'"]').first().prop("checked",!0)})}},_getValue:function(){var t=[];return this.$(":checked").each(function(){t.push(a(this).val())}),e.isEmpty(t)?null:this.model.get("multiple")?t:t[0]},_messageShow:function(e,t){this.$message.show().removeClass().addClass("ui-message alert alert-"+t).html(e)},_template:function(){return a("
").addClass("ui-options-list")}}),n=i.extend({_templateOption:function(t){var i=e.uid();return a("
").addClass("ui-option").append(a("").attr({id:i,type:this.model.get("type"),name:this.model.id,value:t.value})).append(a("