From b8b0e4412247bd0f7611710ce69e0b4e9a76b4d7 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Fri, 20 Nov 2015 12:11:01 -0500 Subject: [PATCH 1/3] Strip whitespace --- client/galaxy/scripts/galaxy.masthead.js | 124 +++++++++++------------ 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/client/galaxy/scripts/galaxy.masthead.js b/client/galaxy/scripts/galaxy.masthead.js index 8b7b20d7d38..08b27482d3c 100644 --- a/client/galaxy/scripts/galaxy.masthead.js +++ b/client/galaxy/scripts/galaxy.masthead.js @@ -5,33 +5,33 @@ define([], function() { var GalaxyMasthead = Backbone.View.extend({ // base element el_masthead: '#everything', - + // options options : null, - + // background $background: null, - + // list list: [], - + // initialize initialize : function(options) { // update options this.options = options; - + // HACK: due to body events defined in galaxy.panels.js $("body").off(); - + // define this element this.setElement($(this._template(options))); - + // append to masthead $(this.el_masthead).append($(this.el)); - + // assign background this.$background = $(this.el).find('#masthead-background'); - + // loop through unload functions if the user attempts to unload the page var self = this; $(window).on('beforeunload', function() { @@ -58,12 +58,12 @@ var GalaxyMasthead = Backbone.View.extend({ append : function(item) { return this._add(item, true); }, - + // adds a new item to the masthead prepend : function(item) { return this._add(item, false); }, - + // activate highlight: function(id) { var current = $(this.el).find('#' + id + '> li'); @@ -71,28 +71,28 @@ var GalaxyMasthead = Backbone.View.extend({ current.addClass('active'); } }, - + // adds a new item to the masthead _add : function(item, append) { var $loc = $(this.el).find('#' + item.location); if ($loc){ // create frame for new item var $current = $(item.el); - + // configure class in order to mark new items $current.addClass('masthead-item'); - + // append to masthead if (append) { $loc.append($current); } else { $loc.prepend($current); } - + // add to list this.list.push(item); } - + // location not found return null; }, @@ -104,7 +104,7 @@ var GalaxyMasthead = Backbone.View.extend({ if ($all) { $all.hide(); } - + // open current item var $current = $(e.target).closest('.masthead-item').find('.popup'); if ($(e.target).hasClass('head')) { @@ -114,11 +114,11 @@ var GalaxyMasthead = Backbone.View.extend({ this.$background.hide(); } }, - + /* HTML TEMPLATES */ - + // fill template _template: function(options) { var brand_text = options.brand ? ("/ " + options.brand) : "" ; @@ -152,64 +152,64 @@ var GalaxyMastheadIcon = Backbone.View.extend({ onunload : null, visible : true }, - + // location identifier for masthead class location: 'iconbar', - + // initialize initialize: function (options){ // read in defaults if (options) this.options = _.defaults(options, this.options); - + // add template for icon this.setElement($(this._template(this.options))); - + // configure icon var self = this; $(this.el).find('.icon').tooltip({title: this.options.tooltip, placement: 'bottom'}) .on('mouseup', self.options.onclick); - + // visiblity if (!this.options.visible) this.hide(); }, - + // show show: function(){ $(this.el).css({visibility : 'visible'}); }, - + // show hide: function(){ $(this.el).css({visibility : 'hidden'}); }, - + // switch icon icon: function (new_icon){ // update icon class $(this.el).find('.icon').removeClass(this.options.icon) .addClass(new_icon); - + // update icon this.options.icon = new_icon; }, - + // toggle toggle: function(){ $(this.el).addClass('toggle'); }, - + // untoggle untoggle: function(){ $(this.el).removeClass('toggle'); }, - + // set/get number number: function(new_number){ $(this.el).find('.number').text(new_number); }, - + // fill template icon _template: function (options){ var tmpl = '
' + @@ -217,7 +217,7 @@ var GalaxyMastheadIcon = Backbone.View.extend({ if (options.with_number) tmpl+= '
'; tmpl += '
'; - + // return template return tmpl; } @@ -238,33 +238,33 @@ var GalaxyMastheadTab = Backbone.View.extend({ disabled : false, title_attribute : '' }, - + // location location: 'navbar', - + // optional sub menu $menu: null, - + // events events:{ 'click .head' : '_head' }, - + // initialize initialize: function ( options ){ // read in defaults if ( options ){ this.options = _.defaults( options, this.options ); } - + // update url if ( this.options.content !== undefined && this.options.content.indexOf( '//' ) === -1 ){ this.options.content = galaxy_config.root + this.options.content; - } - + } + // add template for tab this.setElement( $( this._template( this.options ) ) ); - + // disable menu items that are not available to anonymous user // also show title to explain why they are disabled if ( this.options.disabled ){ @@ -277,17 +277,17 @@ var GalaxyMastheadTab = Backbone.View.extend({ this.hide(); } }, - + // show show: function(){ $(this.el).css({visibility : 'visible'}); }, - + // show hide: function(){ $(this.el).css({visibility : 'hidden'}); }, - + // add menu item add: function (options){ // menu option defaults @@ -299,64 +299,64 @@ var GalaxyMastheadTab = Backbone.View.extend({ scratchbook : false, divider : false } - + // read in defaults if (options) menuOptions = _.defaults(options, menuOptions); - + // update url if (menuOptions.content && menuOptions.content.indexOf('//') === -1) menuOptions.content = galaxy_config.root + menuOptions.content; - + // check if submenu element is available if (!this.$menu){ // insert submenu element into root $(this.el).find('.root').append(this._templateMenu()); - + // show caret $(this.el).find('.symbol').addClass('caret'); - + // update element link this.$menu = $(this.el).find('.popup'); } - + // create var $item = $(this._templateMenuItem(menuOptions)); - + // append menu this.$menu.append($item); - + // add events var self = this; $item.on('click', function(e){ // prevent default e.preventDefault(); - + // no modifications if new tab is requested if (self.options.target === '_blank') return true; - + // load into frame Galaxy.frame.add(options); }); - + // append divider if (menuOptions.divider) this.$menu.append($(this._templateDivider())); }, - + // show menu on header click _head: function(e){ // prevent default e.preventDefault(); - + if (this.options.disabled){ return // prevent link following if menu item is disabled } // check for menu options if (!this.$menu) { - Galaxy.frame.add(this.options); + Galaxy.frame.add(this.options); } }, @@ -377,16 +377,16 @@ var GalaxyMastheadTab = Backbone.View.extend({ _templateMenuItem: function (options){ return '
  • ' + options.title + '
    • '; }, - + // fill template header _templateMenu: function (){ return ''; }, - + _templateDivider: function(){ return '
  • '; }, - + // fill template _template: function (options){ // start template @@ -397,7 +397,7 @@ var GalaxyMastheadTab = Backbone.View.extend({ '' + '' + ''; - + // return template return tmpl; } From f0e28555af8129eae424c3e677b6bb22a4c68154 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Fri, 20 Nov 2015 12:11:55 -0500 Subject: [PATCH 2/3] Support onclick for menu items. --- client/galaxy/scripts/galaxy.masthead.js | 30 ++++++++++++++++-------- static/maps/galaxy.masthead.js.map | 2 +- static/scripts/galaxy.masthead.js | 2 +- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/client/galaxy/scripts/galaxy.masthead.js b/client/galaxy/scripts/galaxy.masthead.js index 08b27482d3c..d0c652576b1 100644 --- a/client/galaxy/scripts/galaxy.masthead.js +++ b/client/galaxy/scripts/galaxy.masthead.js @@ -297,7 +297,8 @@ var GalaxyMastheadTab = Backbone.View.extend({ type : 'url', target : '_parent', scratchbook : false, - divider : false + divider : false, + onclick : undefined } // read in defaults @@ -325,20 +326,29 @@ var GalaxyMastheadTab = Backbone.View.extend({ // append menu this.$menu.append($item); - // add events var self = this; - $item.on('click', function(e){ - // prevent default - e.preventDefault(); + if (menuOptions.onclick !== undefined){ + $item.on('click', function(e){ + e.preventDefault(); + menuOptions.onclick(); + }); + } else { + $item.on('click', function(e){ + // prevent default + e.preventDefault(); - // no modifications if new tab is requested - if (self.options.target === '_blank') + //self.options.click_fn() return true; - // load into frame - Galaxy.frame.add(options); - }); + // no modifications if new tab is requested + if (self.options.target === '_blank') + return true; + + // load into frame + Galaxy.frame.add(options); + }); + } // append divider if (menuOptions.divider) diff --git a/static/maps/galaxy.masthead.js.map b/static/maps/galaxy.masthead.js.map index e9b27cbda38..75c841122cf 100644 --- a/static/maps/galaxy.masthead.js.map +++ b/static/maps/galaxy.masthead.js.map @@ -1 +1 @@ -{"version":3,"file":"galaxy.masthead.js","sources":["../src/galaxy.masthead.js"],"names":["define","GalaxyMasthead","Backbone","View","extend","el_masthead","options","$background","list","initialize","this","$","off","setElement","_template","append","el","find","self","window","on","text","key","onunload","q","events","click","mousedown","e","preventDefault","item","_add","prepend","highlight","id","current","addClass","$loc","location","$current","push","_click","$all","hide","target","closest","hasClass","show","brand_text","brand","logo_url","galaxy_config","root","GalaxyMastheadIcon","icon","tooltip","with_number","onclick","alert","visible","_","defaults","title","placement","css","visibility","new_icon","removeClass","toggle","untoggle","number","new_number","tmpl","GalaxyMastheadTab","content","type","scratchbook","disabled","title_attribute","$menu","click .head","undefined","indexOf","_attachPopover","add","menuOptions","divider","_templateMenu","$item","_templateMenuItem","Galaxy","frame","_templateDivider","_head","$popover_element","popover","html","setTimeout"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"galaxy.masthead.js","sources":["../src/galaxy.masthead.js"],"names":["define","GalaxyMasthead","Backbone","View","extend","el_masthead","options","$background","list","initialize","this","$","off","setElement","_template","append","el","find","self","window","on","text","key","onunload","q","events","click","mousedown","e","preventDefault","item","_add","prepend","highlight","id","current","addClass","$loc","location","$current","push","_click","$all","hide","target","closest","hasClass","show","brand_text","brand","logo_url","galaxy_config","root","GalaxyMastheadIcon","icon","tooltip","with_number","onclick","alert","visible","_","defaults","title","placement","css","visibility","new_icon","removeClass","toggle","untoggle","number","new_number","tmpl","GalaxyMastheadTab","content","type","scratchbook","disabled","title_attribute","$menu","click .head","undefined","indexOf","_attachPopover","add","menuOptions","divider","_templateMenu","$item","_templateMenuItem","_templateDivider","_head","Galaxy","frame","$popover_element","popover","html","setTimeout"],"mappings":"AACAA,UAAW,WAGX,GAAIC,GAAiBC,SAASC,KAAKC,QAE/BC,YAAa,cAGbC,QAAU,KAGVC,YAAa,KAGbC,QAGAC,WAAa,SAASH,GAElBI,KAAKJ,QAAUA,EAGfK,EAAE,QAAQC,MAGVF,KAAKG,WAAWF,EAAED,KAAKI,UAAUR,KAGjCK,EAAED,KAAKL,aAAaU,OAAOJ,EAAED,KAAKM,KAGlCN,KAAKH,YAAcI,EAAED,KAAKM,IAAIC,KAAK,uBAGnC,IAAIC,GAAOR,IACXC,GAAEQ,QAAQC,GAAG,eAAgB,WACzB,GAAIC,GAAO,EACX,KAAKC,MAAOJ,GAAKV,KACb,GAAIU,EAAKV,KAAKc,KAAKhB,QAAQiB,SAAU,CACjC,GAAIC,GAAIN,EAAKV,KAAKc,KAAKhB,QAAQiB,UAC3BC,KAAGH,GAAQG,EAAI,KAG3B,MAAY,IAARH,EACOA,EADX,UAORI,QACIC,MAAc,SACdC,UAAc,SAASC,GAAKA,EAAEC,mBAIlCd,OAAS,SAASe,GACd,MAAOpB,MAAKqB,KAAKD,GAAM,IAI3BE,QAAU,SAASF,GACf,MAAOpB,MAAKqB,KAAKD,GAAM,IAI3BG,UAAW,SAASC,GAChB,GAAIC,GAAUxB,EAAED,KAAKM,IAAIC,KAAK,IAAMiB,EAAK,OACrCC,IACAA,EAAQC,SAAS,WAKzBL,KAAO,SAASD,EAAMf,GAClB,GAAIsB,GAAO1B,EAAED,KAAKM,IAAIC,KAAK,IAAMa,EAAKQ,SACtC,IAAID,EAAK,CAEL,GAAIE,GAAW5B,EAAEmB,EAAKd,GAGtBuB,GAASH,SAAS,iBAGdrB,EACAsB,EAAKtB,OAAOwB,GAEZF,EAAKL,QAAQO,GAIjB7B,KAAKF,KAAKgC,KAAKV,GAInB,MAAO,OAIXW,OAAQ,SAASb,GAEb,GAAIc,GAAO/B,EAAED,KAAKM,IAAIC,KAAK,SACvByB,IACAA,EAAKC,MAIT,IAAIJ,GAAW5B,EAAEiB,EAAEgB,QAAQC,QAAQ,kBAAkB5B,KAAK,SACtDN,GAAEiB,EAAEgB,QAAQE,SAAS,SACrBP,EAASQ,OACTrC,KAAKH,YAAYwC,QAEjBrC,KAAKH,YAAYoC,QASzB7B,UAAW,SAASR,GAChB,GAAI0C,GAAa1C,EAAQ2C,MAAS,KAAO3C,EAAQ2C,MAAS,EAC1D,OAAQ,6PAKsB3C,EAAQ4C,SAAW,uDAC0BC,cAAcC,KAAO,iEAC9CJ,EAAa,uPAYnEK,EAAqBnD,SAASC,KAAKC,QAEnCE,SACI4B,GAAkB,GAClBoB,KAAkB,SAClBC,QAAkB,GAClBC,aAAkB,EAClBC,QAAkB,WAAaC,MAAO,YACtCnC,SAAkB,KAClBoC,SAAkB,GAItBrB,SAAU,UAGV7B,WAAY,SAAUH,GAEdA,IACAI,KAAKJ,QAAUsD,EAAEC,SAASvD,EAASI,KAAKJ,UAG5CI,KAAKG,WAAWF,EAAED,KAAKI,UAAUJ,KAAKJ,UAGtC,IAAIY,GAAOR,IACXC,GAAED,KAAKM,IAAIC,KAAK,SAASsC,SAASO,MAAOpD,KAAKJ,QAAQiD,QAASQ,UAAW,WACjD3C,GAAG,UAAWF,EAAKZ,QAAQmD,SAG/C/C,KAAKJ,QAAQqD,SACdjD,KAAKiC,QAIbI,KAAM,WACFpC,EAAED,KAAKM,IAAIgD,KAAKC,WAAa,aAIjCtB,KAAM,WACFhC,EAAED,KAAKM,IAAIgD,KAAKC,WAAa,YAIjCX,KAAM,SAAUY,GAEZvD,EAAED,KAAKM,IAAIC,KAAK,SAASkD,YAAYzD,KAAKJ,QAAQgD,MACzBlB,SAAS8B,GAGlCxD,KAAKJ,QAAQgD,KAAOY,GAIxBE,OAAQ,WACJzD,EAAED,KAAKM,IAAIoB,SAAS,WAIxBiC,SAAU,WACN1D,EAAED,KAAKM,IAAImD,YAAY,WAI3BG,OAAQ,SAASC,GACb5D,EAAED,KAAKM,IAAIC,KAAK,WAAWI,KAAKkD,IAIpCzD,UAAW,SAAUR,GACjB,GAAIkE,GAAQ,YAAclE,EAAQ4B,GAAK,8CACQ5B,EAAQgD,KAAO,UAM9D,OALIhD,GAAQkD,cACRgB,GAAY,8BAChBA,GAAY,YAQhBC,EAAoBvE,SAASC,KAAKC,QAElCE,SACI4B,GAAkB,GAClB4B,MAAkB,GAClBlB,OAAkB,UAClB8B,QAAkB,GAClBC,KAAkB,MAClBC,aAAkB,EAClBrD,SAAkB,KAClBoC,SAAkB,EAClBkB,UAAkB,EAClBC,gBAAkB,IAItBxC,SAAU,SAGVyC,MAAO,KAGPtD,QACIuD,cAAgB,SAIpBvE,WAAY,SAAWH,GAEdA,IACDI,KAAKJ,QAAUsD,EAAEC,SAAUvD,EAASI,KAAKJ,UAIf2E,SAAzBvE,KAAKJ,QAAQoE,SAAkE,KAAzChE,KAAKJ,QAAQoE,QAAQQ,QAAS,QACrExE,KAAKJ,QAAQoE,QAAUvB,cAAcC,KAAO1C,KAAKJ,QAAQoE,SAI7DhE,KAAKG,WAAYF,EAAGD,KAAKI,UAAWJ,KAAKJ,WAIpCI,KAAKJ,QAAQuE,WACdlE,EAAGD,KAAKM,IAAKC,KAAM,SAAUmB,SAAU,YACvC1B,KAAKyE,kBAIHzE,KAAKJ,QAAQqD,SACfjD,KAAKiC,QAKbI,KAAM,WACFpC,EAAED,KAAKM,IAAIgD,KAAKC,WAAa,aAIjCtB,KAAM,WACFhC,EAAED,KAAKM,IAAIgD,KAAKC,WAAa,YAIjCmB,IAAK,SAAU9E,GAEX,GAAI+E,IACAvB,MAAc,QACdY,QAAc,GACdC,KAAc,MACd/B,OAAc,UACdgC,aAAc,EACdU,SAAc,EACd7B,QAAcwB,OAId3E,KACA+E,EAAczB,EAAEC,SAASvD,EAAS+E,IAGlCA,EAAYX,SAAiD,KAAtCW,EAAYX,QAAQQ,QAAQ,QACnDG,EAAYX,QAAUvB,cAAcC,KAAOiC,EAAYX,SAGtDhE,KAAKqE,QAENpE,EAAED,KAAKM,IAAIC,KAAK,SAASF,OAAOL,KAAK6E,iBAGrC5E,EAAED,KAAKM,IAAIC,KAAK,WAAWmB,SAAS,SAGpC1B,KAAKqE,MAAQpE,EAAED,KAAKM,IAAIC,KAAK,UAIjC,IAAIuE,GAAQ7E,EAAED,KAAK+E,kBAAkBJ,GAGrC3E,MAAKqE,MAAMhE,OAAOyE,EAGUP,UAAxBI,EAAY5B,QACZ+B,EAAMpE,GAAG,QAAS,SAASQ,GACvBA,EAAEC,iBACFwD,EAAY5B,YAGhB+B,EAAMpE,GAAG,QAAS,SAASQ,GAKvB,MAHAA,GAAEC,kBAGK,IAYXwD,EAAYC,SACZ5E,KAAKqE,MAAMhE,OAAOJ,EAAED,KAAKgF,sBAIjCC,MAAO,SAAS/D,GAEZA,EAAEC,iBAEEnB,KAAKJ,QAAQuE,UAKZnE,KAAKqE,OACNa,OAAOC,MAAMT,IAAI1E,KAAKJ,UAI9B6E,eAAiB,WACb,GAAIW,GAAmBnF,EAAED,KAAKM,IAAIC,KAAK,QACvC6E,GAAiBC,SACbC,MAAM,EACNtB,QAAS,mBAAqBvB,cAAcC,KAAO,sDAAwDD,cAAcC,KAAO,iEAChIW,UAAW,WACZ3C,GAAG,mBAAoB,WACtB6E,WAAW,WACPH,EAAiBC,QAAQ,SAC1B,QAKXN,kBAAmB,SAAUnF,GACzB,MAAO,gBAAkBA,EAAQoE,QAAU,aAAepE,EAAQsC,OAAS,KAAOtC,EAAQwD,MAAQ,aAItGyB,cAAe,WACX,MAAO,yCAGXG,iBAAkB,WACd,MAAO,6BAIX5E,UAAW,SAAUR,GAEjB,GAAIkE,GAAQ,WAAalE,EAAQ4B,GAAK,yJAEkD5B,EAAQsC,OAAS,WAAatC,EAAQoE,QAAU,YAAcpE,EAAQwE,gBAAkB,KACxJxE,EAAQwD,MAAQ,sCAMxC,OAAOU,KAKf,QACIvE,eAAgBA,EAChBwE,kBAAmBA,EACnBpB,mBAAoBA"} \ No newline at end of file diff --git a/static/scripts/galaxy.masthead.js b/static/scripts/galaxy.masthead.js index e522aee3f22..4f630ecaadc 100644 --- a/static/scripts/galaxy.masthead.js +++ b/static/scripts/galaxy.masthead.js @@ -1,2 +1,2 @@ -define([],function(){var a=Backbone.View.extend({el_masthead:"#everything",options:null,$background:null,list:[],initialize:function(a){this.options=a,$("body").off(),this.setElement($(this._template(a))),$(this.el_masthead).append($(this.el)),this.$background=$(this.el).find("#masthead-background");var b=this;$(window).on("beforeunload",function(){var a="";for(key in b.list)if(b.list[key].options.onunload){var c=b.list[key].options.onunload();c&&(a+=c+" ")}return""!=a?a:void 0})},events:{click:"_click",mousedown:function(a){a.preventDefault()}},append:function(a){return this._add(a,!0)},prepend:function(a){return this._add(a,!1)},highlight:function(a){var b=$(this.el).find("#"+a+"> li");b&&b.addClass("active")},_add:function(a,b){var c=$(this.el).find("#"+a.location);if(c){var d=$(a.el);d.addClass("masthead-item"),b?c.append(d):c.prepend(d),this.list.push(a)}return null},_click:function(a){var b=$(this.el).find(".popup");b&&b.hide();var c=$(a.target).closest(".masthead-item").find(".popup");$(a.target).hasClass("head")?(c.show(),this.$background.show()):this.$background.hide()},_template:function(a){var b=a.brand?"/ "+a.brand:"";return'
    '}}),b=Backbone.View.extend({options:{id:"",icon:"fa-cog",tooltip:"",with_number:!1,onclick:function(){alert("clicked")},onunload:null,visible:!0},location:"iconbar",initialize:function(a){a&&(this.options=_.defaults(a,this.options)),this.setElement($(this._template(this.options)));var b=this;$(this.el).find(".icon").tooltip({title:this.options.tooltip,placement:"bottom"}).on("mouseup",b.options.onclick),this.options.visible||this.hide()},show:function(){$(this.el).css({visibility:"visible"})},hide:function(){$(this.el).css({visibility:"hidden"})},icon:function(a){$(this.el).find(".icon").removeClass(this.options.icon).addClass(a),this.options.icon=a},toggle:function(){$(this.el).addClass("toggle")},untoggle:function(){$(this.el).removeClass("toggle")},number:function(a){$(this.el).find(".number").text(a)},_template:function(a){var b='
    ';return a.with_number&&(b+='
    '),b+="
    "}}),c=Backbone.View.extend({options:{id:"",title:"",target:"_parent",content:"",type:"url",scratchbook:!1,onunload:null,visible:!0,disabled:!1,title_attribute:""},location:"navbar",$menu:null,events:{"click .head":"_head"},initialize:function(a){a&&(this.options=_.defaults(a,this.options)),void 0!==this.options.content&&-1===this.options.content.indexOf("//")&&(this.options.content=galaxy_config.root+this.options.content),this.setElement($(this._template(this.options))),this.options.disabled&&($(this.el).find(".root").addClass("disabled"),this._attachPopover()),this.options.visible||this.hide()},show:function(){$(this.el).css({visibility:"visible"})},hide:function(){$(this.el).css({visibility:"hidden"})},add:function(a){var b={title:"Title",content:"",type:"url",target:"_parent",scratchbook:!1,divider:!1};a&&(b=_.defaults(a,b)),b.content&&-1===b.content.indexOf("//")&&(b.content=galaxy_config.root+b.content),this.$menu||($(this.el).find(".root").append(this._templateMenu()),$(this.el).find(".symbol").addClass("caret"),this.$menu=$(this.el).find(".popup"));var c=$(this._templateMenuItem(b));this.$menu.append(c);var d=this;c.on("click",function(b){return b.preventDefault(),"_blank"===d.options.target?!0:void Galaxy.frame.add(a)}),b.divider&&this.$menu.append($(this._templateDivider()))},_head:function(a){a.preventDefault(),this.options.disabled||this.$menu||Galaxy.frame.add(this.options)},_attachPopover:function(){var a=$(this.el).find(".head");a.popover({html:!0,content:'Please log in or register to use this feature.',placement:"bottom"}).on("shown.bs.popover",function(){setTimeout(function(){a.popover("hide")},5e3)})},_templateMenuItem:function(a){return'
  • '+a.title+"
    • "},_templateMenu:function(){return''},_templateDivider:function(){return'
  • '},_template:function(a){var b='';return b}});return{GalaxyMasthead:a,GalaxyMastheadTab:c,GalaxyMastheadIcon:b}}); +define([],function(){var a=Backbone.View.extend({el_masthead:"#everything",options:null,$background:null,list:[],initialize:function(a){this.options=a,$("body").off(),this.setElement($(this._template(a))),$(this.el_masthead).append($(this.el)),this.$background=$(this.el).find("#masthead-background");var b=this;$(window).on("beforeunload",function(){var a="";for(key in b.list)if(b.list[key].options.onunload){var c=b.list[key].options.onunload();c&&(a+=c+" ")}return""!=a?a:void 0})},events:{click:"_click",mousedown:function(a){a.preventDefault()}},append:function(a){return this._add(a,!0)},prepend:function(a){return this._add(a,!1)},highlight:function(a){var b=$(this.el).find("#"+a+"> li");b&&b.addClass("active")},_add:function(a,b){var c=$(this.el).find("#"+a.location);if(c){var d=$(a.el);d.addClass("masthead-item"),b?c.append(d):c.prepend(d),this.list.push(a)}return null},_click:function(a){var b=$(this.el).find(".popup");b&&b.hide();var c=$(a.target).closest(".masthead-item").find(".popup");$(a.target).hasClass("head")?(c.show(),this.$background.show()):this.$background.hide()},_template:function(a){var b=a.brand?"/ "+a.brand:"";return'
    '}}),b=Backbone.View.extend({options:{id:"",icon:"fa-cog",tooltip:"",with_number:!1,onclick:function(){alert("clicked")},onunload:null,visible:!0},location:"iconbar",initialize:function(a){a&&(this.options=_.defaults(a,this.options)),this.setElement($(this._template(this.options)));var b=this;$(this.el).find(".icon").tooltip({title:this.options.tooltip,placement:"bottom"}).on("mouseup",b.options.onclick),this.options.visible||this.hide()},show:function(){$(this.el).css({visibility:"visible"})},hide:function(){$(this.el).css({visibility:"hidden"})},icon:function(a){$(this.el).find(".icon").removeClass(this.options.icon).addClass(a),this.options.icon=a},toggle:function(){$(this.el).addClass("toggle")},untoggle:function(){$(this.el).removeClass("toggle")},number:function(a){$(this.el).find(".number").text(a)},_template:function(a){var b='
    ';return a.with_number&&(b+='
    '),b+="
    "}}),c=Backbone.View.extend({options:{id:"",title:"",target:"_parent",content:"",type:"url",scratchbook:!1,onunload:null,visible:!0,disabled:!1,title_attribute:""},location:"navbar",$menu:null,events:{"click .head":"_head"},initialize:function(a){a&&(this.options=_.defaults(a,this.options)),void 0!==this.options.content&&-1===this.options.content.indexOf("//")&&(this.options.content=galaxy_config.root+this.options.content),this.setElement($(this._template(this.options))),this.options.disabled&&($(this.el).find(".root").addClass("disabled"),this._attachPopover()),this.options.visible||this.hide()},show:function(){$(this.el).css({visibility:"visible"})},hide:function(){$(this.el).css({visibility:"hidden"})},add:function(a){var b={title:"Title",content:"",type:"url",target:"_parent",scratchbook:!1,divider:!1,onclick:void 0};a&&(b=_.defaults(a,b)),b.content&&-1===b.content.indexOf("//")&&(b.content=galaxy_config.root+b.content),this.$menu||($(this.el).find(".root").append(this._templateMenu()),$(this.el).find(".symbol").addClass("caret"),this.$menu=$(this.el).find(".popup"));var c=$(this._templateMenuItem(b));this.$menu.append(c);void 0!==b.onclick?c.on("click",function(a){a.preventDefault(),b.onclick()}):c.on("click",function(a){return a.preventDefault(),!0}),b.divider&&this.$menu.append($(this._templateDivider()))},_head:function(a){a.preventDefault(),this.options.disabled||this.$menu||Galaxy.frame.add(this.options)},_attachPopover:function(){var a=$(this.el).find(".head");a.popover({html:!0,content:'Please log in or register to use this feature.',placement:"bottom"}).on("shown.bs.popover",function(){setTimeout(function(){a.popover("hide")},5e3)})},_templateMenuItem:function(a){return'
  • '+a.title+"
    • "},_templateMenu:function(){return''},_templateDivider:function(){return'
  • '},_template:function(a){var b='';return b}});return{GalaxyMasthead:a,GalaxyMastheadTab:c,GalaxyMastheadIcon:b}}); //# sourceMappingURL=../maps/galaxy.masthead.js.map \ No newline at end of file From 81f1b7f8e0ce0febe18460e67a97651aa1fd72a3 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Fri, 20 Nov 2015 13:17:46 -0500 Subject: [PATCH 3/3] Remove debugging logic and shortcut. --- client/galaxy/scripts/galaxy.masthead.js | 3 --- static/maps/galaxy.masthead.js.map | 2 +- static/scripts/galaxy.masthead.js | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/client/galaxy/scripts/galaxy.masthead.js b/client/galaxy/scripts/galaxy.masthead.js index d0c652576b1..3eac2890581 100644 --- a/client/galaxy/scripts/galaxy.masthead.js +++ b/client/galaxy/scripts/galaxy.masthead.js @@ -338,9 +338,6 @@ var GalaxyMastheadTab = Backbone.View.extend({ // prevent default e.preventDefault(); - //self.options.click_fn() - return true; - // no modifications if new tab is requested if (self.options.target === '_blank') return true; diff --git a/static/maps/galaxy.masthead.js.map b/static/maps/galaxy.masthead.js.map index 75c841122cf..800edad81a2 100644 --- a/static/maps/galaxy.masthead.js.map +++ b/static/maps/galaxy.masthead.js.map @@ -1 +1 @@ -{"version":3,"file":"galaxy.masthead.js","sources":["../src/galaxy.masthead.js"],"names":["define","GalaxyMasthead","Backbone","View","extend","el_masthead","options","$background","list","initialize","this","$","off","setElement","_template","append","el","find","self","window","on","text","key","onunload","q","events","click","mousedown","e","preventDefault","item","_add","prepend","highlight","id","current","addClass","$loc","location","$current","push","_click","$all","hide","target","closest","hasClass","show","brand_text","brand","logo_url","galaxy_config","root","GalaxyMastheadIcon","icon","tooltip","with_number","onclick","alert","visible","_","defaults","title","placement","css","visibility","new_icon","removeClass","toggle","untoggle","number","new_number","tmpl","GalaxyMastheadTab","content","type","scratchbook","disabled","title_attribute","$menu","click .head","undefined","indexOf","_attachPopover","add","menuOptions","divider","_templateMenu","$item","_templateMenuItem","_templateDivider","_head","Galaxy","frame","$popover_element","popover","html","setTimeout"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"galaxy.masthead.js","sources":["../src/galaxy.masthead.js"],"names":["define","GalaxyMasthead","Backbone","View","extend","el_masthead","options","$background","list","initialize","this","$","off","setElement","_template","append","el","find","self","window","on","text","key","onunload","q","events","click","mousedown","e","preventDefault","item","_add","prepend","highlight","id","current","addClass","$loc","location","$current","push","_click","$all","hide","target","closest","hasClass","show","brand_text","brand","logo_url","galaxy_config","root","GalaxyMastheadIcon","icon","tooltip","with_number","onclick","alert","visible","_","defaults","title","placement","css","visibility","new_icon","removeClass","toggle","untoggle","number","new_number","tmpl","GalaxyMastheadTab","content","type","scratchbook","disabled","title_attribute","$menu","click .head","undefined","indexOf","_attachPopover","add","menuOptions","divider","_templateMenu","$item","_templateMenuItem","Galaxy","frame","_templateDivider","_head","$popover_element","popover","html","setTimeout"],"mappings":"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"} \ No newline at end of file diff --git a/static/scripts/galaxy.masthead.js b/static/scripts/galaxy.masthead.js index 4f630ecaadc..6fb067e5023 100644 --- a/static/scripts/galaxy.masthead.js +++ b/static/scripts/galaxy.masthead.js @@ -1,2 +1,2 @@ -define([],function(){var a=Backbone.View.extend({el_masthead:"#everything",options:null,$background:null,list:[],initialize:function(a){this.options=a,$("body").off(),this.setElement($(this._template(a))),$(this.el_masthead).append($(this.el)),this.$background=$(this.el).find("#masthead-background");var b=this;$(window).on("beforeunload",function(){var a="";for(key in b.list)if(b.list[key].options.onunload){var c=b.list[key].options.onunload();c&&(a+=c+" ")}return""!=a?a:void 0})},events:{click:"_click",mousedown:function(a){a.preventDefault()}},append:function(a){return this._add(a,!0)},prepend:function(a){return this._add(a,!1)},highlight:function(a){var b=$(this.el).find("#"+a+"> li");b&&b.addClass("active")},_add:function(a,b){var c=$(this.el).find("#"+a.location);if(c){var d=$(a.el);d.addClass("masthead-item"),b?c.append(d):c.prepend(d),this.list.push(a)}return null},_click:function(a){var b=$(this.el).find(".popup");b&&b.hide();var c=$(a.target).closest(".masthead-item").find(".popup");$(a.target).hasClass("head")?(c.show(),this.$background.show()):this.$background.hide()},_template:function(a){var b=a.brand?"/ "+a.brand:"";return'
    '}}),b=Backbone.View.extend({options:{id:"",icon:"fa-cog",tooltip:"",with_number:!1,onclick:function(){alert("clicked")},onunload:null,visible:!0},location:"iconbar",initialize:function(a){a&&(this.options=_.defaults(a,this.options)),this.setElement($(this._template(this.options)));var b=this;$(this.el).find(".icon").tooltip({title:this.options.tooltip,placement:"bottom"}).on("mouseup",b.options.onclick),this.options.visible||this.hide()},show:function(){$(this.el).css({visibility:"visible"})},hide:function(){$(this.el).css({visibility:"hidden"})},icon:function(a){$(this.el).find(".icon").removeClass(this.options.icon).addClass(a),this.options.icon=a},toggle:function(){$(this.el).addClass("toggle")},untoggle:function(){$(this.el).removeClass("toggle")},number:function(a){$(this.el).find(".number").text(a)},_template:function(a){var b='
    ';return a.with_number&&(b+='
    '),b+="
    "}}),c=Backbone.View.extend({options:{id:"",title:"",target:"_parent",content:"",type:"url",scratchbook:!1,onunload:null,visible:!0,disabled:!1,title_attribute:""},location:"navbar",$menu:null,events:{"click .head":"_head"},initialize:function(a){a&&(this.options=_.defaults(a,this.options)),void 0!==this.options.content&&-1===this.options.content.indexOf("//")&&(this.options.content=galaxy_config.root+this.options.content),this.setElement($(this._template(this.options))),this.options.disabled&&($(this.el).find(".root").addClass("disabled"),this._attachPopover()),this.options.visible||this.hide()},show:function(){$(this.el).css({visibility:"visible"})},hide:function(){$(this.el).css({visibility:"hidden"})},add:function(a){var b={title:"Title",content:"",type:"url",target:"_parent",scratchbook:!1,divider:!1,onclick:void 0};a&&(b=_.defaults(a,b)),b.content&&-1===b.content.indexOf("//")&&(b.content=galaxy_config.root+b.content),this.$menu||($(this.el).find(".root").append(this._templateMenu()),$(this.el).find(".symbol").addClass("caret"),this.$menu=$(this.el).find(".popup"));var c=$(this._templateMenuItem(b));this.$menu.append(c);void 0!==b.onclick?c.on("click",function(a){a.preventDefault(),b.onclick()}):c.on("click",function(a){return a.preventDefault(),!0}),b.divider&&this.$menu.append($(this._templateDivider()))},_head:function(a){a.preventDefault(),this.options.disabled||this.$menu||Galaxy.frame.add(this.options)},_attachPopover:function(){var a=$(this.el).find(".head");a.popover({html:!0,content:'Please log in or register to use this feature.',placement:"bottom"}).on("shown.bs.popover",function(){setTimeout(function(){a.popover("hide")},5e3)})},_templateMenuItem:function(a){return'
  • '+a.title+"
    • "},_templateMenu:function(){return'
      '},_templateDivider:function(){return'
    • '},_template:function(a){var b='';return b}});return{GalaxyMasthead:a,GalaxyMastheadTab:c,GalaxyMastheadIcon:b}}); +define([],function(){var a=Backbone.View.extend({el_masthead:"#everything",options:null,$background:null,list:[],initialize:function(a){this.options=a,$("body").off(),this.setElement($(this._template(a))),$(this.el_masthead).append($(this.el)),this.$background=$(this.el).find("#masthead-background");var b=this;$(window).on("beforeunload",function(){var a="";for(key in b.list)if(b.list[key].options.onunload){var c=b.list[key].options.onunload();c&&(a+=c+" ")}return""!=a?a:void 0})},events:{click:"_click",mousedown:function(a){a.preventDefault()}},append:function(a){return this._add(a,!0)},prepend:function(a){return this._add(a,!1)},highlight:function(a){var b=$(this.el).find("#"+a+"> li");b&&b.addClass("active")},_add:function(a,b){var c=$(this.el).find("#"+a.location);if(c){var d=$(a.el);d.addClass("masthead-item"),b?c.append(d):c.prepend(d),this.list.push(a)}return null},_click:function(a){var b=$(this.el).find(".popup");b&&b.hide();var c=$(a.target).closest(".masthead-item").find(".popup");$(a.target).hasClass("head")?(c.show(),this.$background.show()):this.$background.hide()},_template:function(a){var b=a.brand?"/ "+a.brand:"";return'
      '}}),b=Backbone.View.extend({options:{id:"",icon:"fa-cog",tooltip:"",with_number:!1,onclick:function(){alert("clicked")},onunload:null,visible:!0},location:"iconbar",initialize:function(a){a&&(this.options=_.defaults(a,this.options)),this.setElement($(this._template(this.options)));var b=this;$(this.el).find(".icon").tooltip({title:this.options.tooltip,placement:"bottom"}).on("mouseup",b.options.onclick),this.options.visible||this.hide()},show:function(){$(this.el).css({visibility:"visible"})},hide:function(){$(this.el).css({visibility:"hidden"})},icon:function(a){$(this.el).find(".icon").removeClass(this.options.icon).addClass(a),this.options.icon=a},toggle:function(){$(this.el).addClass("toggle")},untoggle:function(){$(this.el).removeClass("toggle")},number:function(a){$(this.el).find(".number").text(a)},_template:function(a){var b='
      ';return a.with_number&&(b+='
      '),b+="
      "}}),c=Backbone.View.extend({options:{id:"",title:"",target:"_parent",content:"",type:"url",scratchbook:!1,onunload:null,visible:!0,disabled:!1,title_attribute:""},location:"navbar",$menu:null,events:{"click .head":"_head"},initialize:function(a){a&&(this.options=_.defaults(a,this.options)),void 0!==this.options.content&&-1===this.options.content.indexOf("//")&&(this.options.content=galaxy_config.root+this.options.content),this.setElement($(this._template(this.options))),this.options.disabled&&($(this.el).find(".root").addClass("disabled"),this._attachPopover()),this.options.visible||this.hide()},show:function(){$(this.el).css({visibility:"visible"})},hide:function(){$(this.el).css({visibility:"hidden"})},add:function(a){var b={title:"Title",content:"",type:"url",target:"_parent",scratchbook:!1,divider:!1,onclick:void 0};a&&(b=_.defaults(a,b)),b.content&&-1===b.content.indexOf("//")&&(b.content=galaxy_config.root+b.content),this.$menu||($(this.el).find(".root").append(this._templateMenu()),$(this.el).find(".symbol").addClass("caret"),this.$menu=$(this.el).find(".popup"));var c=$(this._templateMenuItem(b));this.$menu.append(c);var d=this;void 0!==b.onclick?c.on("click",function(a){a.preventDefault(),b.onclick()}):c.on("click",function(b){return b.preventDefault(),"_blank"===d.options.target?!0:void Galaxy.frame.add(a)}),b.divider&&this.$menu.append($(this._templateDivider()))},_head:function(a){a.preventDefault(),this.options.disabled||this.$menu||Galaxy.frame.add(this.options)},_attachPopover:function(){var a=$(this.el).find(".head");a.popover({html:!0,content:'Please log in or register to use this feature.',placement:"bottom"}).on("shown.bs.popover",function(){setTimeout(function(){a.popover("hide")},5e3)})},_templateMenuItem:function(a){return'
    • '+a.title+"
      • "},_templateMenu:function(){return'
        '},_templateDivider:function(){return'
      • '},_template:function(a){var b='';return b}});return{GalaxyMasthead:a,GalaxyMastheadTab:c,GalaxyMastheadIcon:b}}); //# sourceMappingURL=../maps/galaxy.masthead.js.map \ No newline at end of file