mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-24 16:30:27 +08:00
Webpack: polyfill object.assign for phantomjs; remove galaxy.frame.masthead.css in favor of adding styles locally; change css load order to prevent 'ui-button' name collision between base and jquery-ui
This commit is contained in:
carlfeberhard
@@ -59,7 +59,7 @@ var HistoryPanel = RightPanel.extend({
|
||||
|
||||
render : function(){
|
||||
RightPanel.prototype.render.call( this );
|
||||
this.debug( 'rendering:' );
|
||||
this.$( '.unified-panel-header' ).addClass( 'history-panel-header' );
|
||||
this.$( '.panel-header-buttons' ).append([
|
||||
this.refreshButton.$el,
|
||||
this.optionsButton.$el,
|
||||
|
||||
@@ -28,7 +28,8 @@ var ToolPanel = LeftPanel.extend({
|
||||
layout : options.toolbox_in_panel
|
||||
});
|
||||
this.tool_panel_view = new Tools.ToolPanelView({ model: this.tool_panel });
|
||||
// add upload plugin
|
||||
|
||||
// add upload modal
|
||||
this.uploadButton = new Upload( options );
|
||||
}
|
||||
},
|
||||
|
||||
@@ -28,10 +28,8 @@ var GalaxyMasthead = Backbone.View.extend({
|
||||
$("body").off();
|
||||
|
||||
// define this element
|
||||
this.setElement($(this._template(options)));
|
||||
|
||||
// append to masthead
|
||||
$(this.el_masthead).append($(this.el));
|
||||
this.$el.html(this._template(options));
|
||||
$(this.el_masthead).find('#masthead').replaceWith(this.$el);
|
||||
|
||||
// assign background
|
||||
this.$background = $(this.el).find('#masthead-background');
|
||||
|
||||
@@ -29,6 +29,9 @@ var PageLayoutView = Backbone.View.extend( BASE_MVC.LoggableMixin ).extend({
|
||||
this.log( this + '.initialize:', options );
|
||||
_.extend( this, _.pick( options, this._panelIds ) );
|
||||
this.options = _.defaults( _.omit( options, this._panelIds ), this.defaultOptions );
|
||||
|
||||
// TODO: remove globals
|
||||
Galaxy.modal = this.modal = new MODAL.View();
|
||||
},
|
||||
|
||||
/** */
|
||||
@@ -41,13 +44,10 @@ var PageLayoutView = Backbone.View.extend( BASE_MVC.LoggableMixin ).extend({
|
||||
this.$el.attr( 'scroll', 'no' );
|
||||
this.$el.html( this.template( this.options ) );
|
||||
|
||||
this.modal = new MODAL.View();
|
||||
//TODO: no render on masthead, needs init each time
|
||||
this.masthead = new MASTHEAD.GalaxyMasthead( this.options.config );
|
||||
|
||||
// TODO: remove globals
|
||||
Galaxy.modal = this.modal;
|
||||
Galaxy.masthead = this.masthead;
|
||||
Galaxy.masthead = this.masthead = new MASTHEAD.GalaxyMasthead( _.extend( this.options.config, {
|
||||
el: this.$( '#masthead' ).get(0)
|
||||
}));
|
||||
|
||||
if( this.options.message_box_visible ){
|
||||
this.messageBox( this.options.message_box_content, this.options.message_box_class );
|
||||
@@ -105,6 +105,7 @@ var PageLayoutView = Backbone.View.extend( BASE_MVC.LoggableMixin ).extend({
|
||||
return [
|
||||
'<div id="everything" style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;">',
|
||||
'<div id="background"/>',
|
||||
'<div id="masthead" class="navbar navbar-fixed-top navbar-inverse"></div>',
|
||||
'<div id="messagebox" style="display: none;"></div>',
|
||||
'<div id="inactivebox" class="panel-warning-message" style="display: none;"></div>',
|
||||
// content here
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
// phantomjs: does not have the native extend fn assign
|
||||
Object.assign = Object.assign || _.extend;
|
||||
|
||||
(function() {
|
||||
'use strict';
|
||||
/*globals window, clearTimeout */
|
||||
|
||||
@@ -8,15 +8,15 @@ define([
|
||||
// support both requirejs and webpack from the same file
|
||||
// if loaded via webpack, it will be a different format than via requirejs - convert
|
||||
if( localeStrings.hasOwnProperty( '__root' ) ){
|
||||
//console.debug( 'amdi18n+webpack localization for ' + locale + ' loaded' );
|
||||
var locale = (
|
||||
typeof navigator === 'undefined' ? '__root'
|
||||
: ( navigator.language || navigator.userLanguage || '__root' ).toLowerCase()
|
||||
);
|
||||
localeStrings = localeStrings[ '__' + locale ] || localeStrings.__root;
|
||||
console.debug( 'amdi18n+webpack localization for ' + locale + ' loaded' );
|
||||
|
||||
} else {
|
||||
console.debug( 'i18n+requirejs localization for ' + locale + ' loaded' );
|
||||
// } else {
|
||||
// console.debug( 'i18n+requirejs localization for ' + locale + ' loaded' );
|
||||
}
|
||||
// TODO: when this is no longer necessary remove this, i18n.js, and the resolveModule in config
|
||||
|
||||
|
||||
@@ -671,7 +671,9 @@ class User( BaseUIController, UsesFormDefinitionsMixin, CreatesUsersMixin, Creat
|
||||
username = util.restore_text( params.get( 'username', '' ) )
|
||||
subscribe = params.get( 'subscribe', '' )
|
||||
subscribe_checked = CheckboxField.is_checked( subscribe )
|
||||
redirect = kwd.get( 'redirect', trans.request.referer ).strip()
|
||||
redirect = kwd.get( 'redirect', trans.request.referer )
|
||||
if redirect:
|
||||
redirect = redirect.strip()
|
||||
is_admin = cntrller == 'admin' and trans.user_is_admin
|
||||
if not trans.app.config.allow_user_creation and not trans.user_is_admin():
|
||||
message = 'User registration is disabled. Please contact your local Galaxy administrator for an account.'
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"version":3,"file":"masthead.js","sources":["../../src/layout/masthead.js"],"names":["define","Utils","Menu","Scratchbook","QuotaMeter","GalaxyMasthead","Backbone","View","extend","el_masthead","options","$background","list","initialize","this","$","off","setElement","_template","append","el","find","self","window","on","text","key","onunload","q","menu","Galaxy","GalaxyMenu","masthead","config","frame","GalaxyFrame","quotaMeter","UserQuotaMeter","model","user","render","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","root"],"mappings":"AAAAA,QACI,cACA,cACA,qBACA,4BACD,SAASC,EAAOC,EAAMC,EAAaC,GAGtC,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,KAAK,GAAIC,KAAOJ,GAAKV,KACjB,GAAIU,EAAKV,KAAKc,GAAKhB,QAAQiB,SAAU,CACjC,GAAIC,GAAIN,EAAKV,KAAKc,GAAKhB,QAAQiB,UAC3BC,KAAGH,GAAQG,EAAI,KAG3B,MAAa,KAATH,EACOA,EADX,SAMJX,KAAKe,KAAOC,OAAOD,KAAO,GAAI3B,GAAK6B,YAC/BC,SAAclB,KACdmB,OAAcnB,KAAKJ,UAIvBI,KAAKoB,MAAQJ,OAAOI,MAAQ,GAAI/B,GAAYgC,aACxCH,SAAclB,OAKlBgB,OAAOM,WAAa,GAAIhC,GAAWiC,gBAC/BC,MAAcR,OAAOS,KACrBnB,GAAcN,KAAKC,EAAG,4BACvByB,UAIPC,QACIC,MAAc,SACdC,UAAc,SAASC,GAAKA,EAAEC,mBAIlC1B,OAAS,SAAS2B,GACd,MAAOhC,MAAKiC,KAAKD,GAAM,IAI3BE,QAAU,SAASF,GACf,MAAOhC,MAAKiC,KAAKD,GAAM,IAI3BG,UAAW,SAASC,GAChB,GAAIC,GAAUpC,EAAED,KAAKM,IAAIC,KAAK,IAAM6B,EAAK,OACrCC,IACAA,EAAQC,SAAS,WAKzBL,KAAO,SAASD,EAAM3B,GAClB,GAAIkC,GAAOtC,EAAED,KAAKM,IAAIC,KAAK,IAAMyB,EAAKQ,SACtC,IAAID,EAAK,CAEL,GAAIE,GAAWxC,EAAE+B,EAAK1B,GAGtBmC,GAASH,SAAS,iBAGdjC,EACAkC,EAAKlC,OAAOoC,GAEZF,EAAKL,QAAQO,GAIjBzC,KAAKF,KAAK4C,KAAKV,GAInB,MAAO,OAIXW,OAAQ,SAASb,GAEb,GAAIc,GAAO3C,EAAED,KAAKM,IAAIC,KAAK,SACvBqC,IACAA,EAAKC,MAIT,IAAIJ,GAAWxC,EAAE6B,EAAEgB,QAAQC,QAAQ,kBAAkBxC,KAAK,SACtDN,GAAE6B,EAAEgB,QAAQE,SAAS,SACrBP,EAASQ,OACTjD,KAAKH,YAAYoD,QAEjBjD,KAAKH,YAAYgD,QASzBzC,UAAW,SAASR,GAChB,GAAIsD,GAAatD,EAAQuD,MAAS,KAAOvD,EAAQuD,MAAS,EAC1D,OAAQ,6PAKsBvD,EAAQwD,SAAW,uDAC0BpC,OAAOqC,KAAO,iEACvCH,EAAa,sPAYvE,QACI3D,eAAgBA"}
|
||||
{"version":3,"file":"masthead.js","sources":["../../src/layout/masthead.js"],"names":["define","Utils","Menu","Scratchbook","QuotaMeter","GalaxyMasthead","Backbone","View","extend","el_masthead","options","$background","list","initialize","this","$","off","$el","html","_template","find","replaceWith","el","self","window","on","text","key","onunload","q","menu","Galaxy","GalaxyMenu","masthead","config","frame","GalaxyFrame","quotaMeter","UserQuotaMeter","model","user","render","events","click","mousedown","e","preventDefault","append","item","_add","prepend","highlight","id","current","addClass","$loc","location","$current","push","_click","$all","hide","target","closest","hasClass","show","brand_text","brand","logo_url","root"],"mappings":"AAAAA,QACI,cACA,cACA,qBACA,4BACD,SAASC,EAAOC,EAAMC,EAAaC,GAGtC,GAAIC,GAAiBC,SAASC,KAAKC,QAE/BC,YAAa,cAGbC,QAAU,KAGVC,YAAa,KAGbC,QAGAC,WAAa,SAASH,GAElBI,KAAKJ,QAAUA,EAGfK,EAAE,QAAQC,MAGVF,KAAKG,IAAIC,KAAKJ,KAAKK,UAAUT,IAC7BK,EAAED,KAAKL,aAAaW,KAAK,aAAaC,YAAYP,KAAKG,KAGvDH,KAAKH,YAAcI,EAAED,KAAKQ,IAAIF,KAAK,uBAGnC,IAAIG,GAAOT,IACXC,GAAES,QAAQC,GAAG,eAAgB,WACzB,GAAIC,GAAO,EACX,KAAK,GAAIC,KAAOJ,GAAKX,KACjB,GAAIW,EAAKX,KAAKe,GAAKjB,QAAQkB,SAAU,CACjC,GAAIC,GAAIN,EAAKX,KAAKe,GAAKjB,QAAQkB,UAC3BC,KAAGH,GAAQG,EAAI,KAG3B,MAAa,KAATH,EACOA,EADX,SAMJZ,KAAKgB,KAAOC,OAAOD,KAAO,GAAI5B,GAAK8B,YAC/BC,SAAcnB,KACdoB,OAAcpB,KAAKJ,UAIvBI,KAAKqB,MAAQJ,OAAOI,MAAQ,GAAIhC,GAAYiC,aACxCH,SAAcnB,OAKlBiB,OAAOM,WAAa,GAAIjC,GAAWkC,gBAC/BC,MAAcR,OAAOS,KACrBlB,GAAcR,KAAKC,EAAG,4BACvB0B,UAIPC,QACIC,MAAc,SACdC,UAAc,SAASC,GAAKA,EAAEC,mBAIlCC,OAAS,SAASC,GACd,MAAOlC,MAAKmC,KAAKD,GAAM,IAI3BE,QAAU,SAASF,GACf,MAAOlC,MAAKmC,KAAKD,GAAM,IAI3BG,UAAW,SAASC,GAChB,GAAIC,GAAUtC,EAAED,KAAKQ,IAAIF,KAAK,IAAMgC,EAAK,OACrCC,IACAA,EAAQC,SAAS,WAKzBL,KAAO,SAASD,EAAMD,GAClB,GAAIQ,GAAOxC,EAAED,KAAKQ,IAAIF,KAAK,IAAM4B,EAAKQ,SACtC,IAAID,EAAK,CAEL,GAAIE,GAAW1C,EAAEiC,EAAK1B,GAGtBmC,GAASH,SAAS,iBAGdP,EACAQ,EAAKR,OAAOU,GAEZF,EAAKL,QAAQO,GAIjB3C,KAAKF,KAAK8C,KAAKV,GAInB,MAAO,OAIXW,OAAQ,SAASd,GAEb,GAAIe,GAAO7C,EAAED,KAAKQ,IAAIF,KAAK,SACvBwC,IACAA,EAAKC,MAIT,IAAIJ,GAAW1C,EAAE8B,EAAEiB,QAAQC,QAAQ,kBAAkB3C,KAAK,SACtDL,GAAE8B,EAAEiB,QAAQE,SAAS,SACrBP,EAASQ,OACTnD,KAAKH,YAAYsD,QAEjBnD,KAAKH,YAAYkD,QASzB1C,UAAW,SAAST,GAChB,GAAIwD,GAAaxD,EAAQyD,MAAS,KAAOzD,EAAQyD,MAAS,EAC1D,OAAQ,6PAKsBzD,EAAQ0D,SAAW,uDAC0BrC,OAAOsC,KAAO,iEACvCH,EAAa,sPAYvE,QACI7D,eAAgBA"}
|
||||
@@ -1 +1 @@
|
||||
{"version":3,"file":"page.js","sources":["../../src/layout/page.js"],"names":["define","MASTHEAD","PANEL","MODAL","BASE_MVC","PageLayoutView","Backbone","View","extend","LoggableMixin","_logNamespace","el","className","_panelIds","defaultOptions","message_box_visible","message_box_content","message_box_class","show_inactivity_warning","inactivity_box_content","initialize","options","this","log","_","pick","defaults","omit","$everything","$","render","$el","attr","html","template","modal","masthead","GalaxyMasthead","config","Galaxy","messageBox","inactivityWarning","renderPanels","content","level","addClass","toggle","verificationLink","root","append","page","remove","forEach","panelId","has","panelView","setElement","left","center","right","join","hideSidePanels","hide","toString"],"mappings":"AAAAA,QACI,kBACA,eACA,kBACA,gBACD,SAAUC,EAAUC,EAAOC,EAAOC,GAGrC,GAAIC,GAAiBC,SAASC,KAAKC,OAAQJ,EAASK,eAAgBD,QAChEE,cAAgB,SAEhBC,GAAK,OACLC,UAAY,eAEZC,WACI,OAAQ,SAAU,SAGtBC,gBACIC,qBAAsB,EACtBC,oBAAsB,GACtBC,kBAAsB,OAEtBC,yBAA0B,EAC1BC,uBAA0B,IAG9BC,WAAa,SAAUC,GACnBC,KAAKC,IAAKD,KAAO,eAAgBD,GACjCG,EAAEhB,OAAQc,KAAME,EAAEC,KAAMJ,EAASC,KAAKT,YACtCS,KAAKD,QAAUG,EAAEE,SAAUF,EAAEG,KAAMN,EAASC,KAAKT,WAAaS,KAAKR,iBAIvEc,YAAc,WACV,MAAON,MAAKO,EAAG,gBAGnBC,OAAS,WAqBL,MApBAR,MAAKC,IAAKD,KAAO,YACjBA,KAAKS,IAAIC,KAAM,SAAU,MACzBV,KAAKS,IAAIE,KAAMX,KAAKY,SAAUZ,KAAKD,UAEnCC,KAAKa,MAAQ,GAAIhC,GAAMI,KAEvBe,KAAKc,SAAW,GAAInC,GAASoC,eAAgBf,KAAKD,QAAQiB,QAG1DC,OAAOJ,MAAQb,KAAKa,MACpBI,OAAOH,SAAWd,KAAKc,SAEnBd,KAAKD,QAAQN,qBACbO,KAAKkB,WAAYlB,KAAKD,QAAQL,oBAAqBM,KAAKD,QAAQJ,mBAEhEK,KAAKD,QAAQH,yBACbI,KAAKmB,kBAAmBnB,KAAKD,QAAQF,wBAGzCG,KAAKoB,eACEpB,MAIXkB,WAAa,SAAUG,EAASC,GAQ5B,MAPAD,GAAUA,GAAW,GACrBC,EAAQA,GAAS,OACjBtB,KAAKS,IAAIc,SAAU,mBACnBvB,KAAKO,EAAG,eACHG,KAAM,QAAS,SAAWY,EAAQ,YAClCX,KAAMU,GACNG,SAAUH,GACRrB,MAIXmB,kBAAoB,SAAUE,GAC1B,GAAII,GAAmB,YAAcR,OAAOS,KAAO,oDAMnD,OALA1B,MAAKS,IAAIc,SAAU,sBACnBvB,KAAKO,EAAG,gBACHI,KAAMU,GACNM,OAAQ,IAAMF,GACdD,SAAUH,GACRrB,MAIXoB,aAAe,WACX,GAAIQ,GAAO5B,IAUX,OARAO,GAAG,8BAA+BsB,SAClC7B,KAAKT,UAAUuC,QAAS,SAAUC,GAC9B,GAAI7B,EAAE8B,IAAKJ,EAAMG,GAAW,CACxB,GAAIE,GAAYL,EAAMG,EACtBE,GAAUC,WAAY,IAAMH,GAC5BE,EAAUzB,YAGXR,MAKXY,SAAU,WAEN,OACI,gGACI,yBACA,qDACA,oFAGAZ,KAAKmC,KAAQ,mBAAqB,GAClCnC,KAAKoC,OAAQ,qCAAuC,GACpDpC,KAAKqC,MAAQ,oBAAsB,GACvC,SAEA,oDAEA,aACI,4DACI,QACI,wDACA,QACI,gFACA,iDACJ,SACJ,SACJ,SACJ,eACFC,KAAK,KAGXC,eAAiB,WACTvC,KAAKmC,MACLnC,KAAKmC,KAAKK,OAEVxC,KAAKqC,OACLrC,KAAKqC,MAAMG,QAInBC,SAAW,WAAY,MAAO,mBAI9B,QACI1D,eAAgBA"}
|
||||
{"version":3,"file":"page.js","sources":["../../src/layout/page.js"],"names":["define","MASTHEAD","PANEL","MODAL","BASE_MVC","PageLayoutView","Backbone","View","extend","LoggableMixin","_logNamespace","el","className","_panelIds","defaultOptions","message_box_visible","message_box_content","message_box_class","show_inactivity_warning","inactivity_box_content","initialize","options","this","log","_","pick","defaults","omit","Galaxy","modal","$everything","$","render","$el","attr","html","template","masthead","GalaxyMasthead","config","get","messageBox","inactivityWarning","renderPanels","content","level","addClass","toggle","verificationLink","root","append","page","remove","forEach","panelId","has","panelView","setElement","left","center","right","join","hideSidePanels","hide","toString"],"mappings":"AAAAA,QACI,kBACA,eACA,kBACA,gBACD,SAAUC,EAAUC,EAAOC,EAAOC,GAGrC,GAAIC,GAAiBC,SAASC,KAAKC,OAAQJ,EAASK,eAAgBD,QAChEE,cAAgB,SAEhBC,GAAK,OACLC,UAAY,eAEZC,WACI,OAAQ,SAAU,SAGtBC,gBACIC,qBAAsB,EACtBC,oBAAsB,GACtBC,kBAAsB,OAEtBC,yBAA0B,EAC1BC,uBAA0B,IAG9BC,WAAa,SAAUC,GACnBC,KAAKC,IAAKD,KAAO,eAAgBD,GACjCG,EAAEhB,OAAQc,KAAME,EAAEC,KAAMJ,EAASC,KAAKT,YACtCS,KAAKD,QAAUG,EAAEE,SAAUF,EAAEG,KAAMN,EAASC,KAAKT,WAAaS,KAAKR,gBAGnEc,OAAOC,MAAQP,KAAKO,MAAQ,GAAI1B,GAAMI,MAI1CuB,YAAc,WACV,MAAOR,MAAKS,EAAG,gBAGnBC,OAAS,WAkBL,MAjBAV,MAAKC,IAAKD,KAAO,YACjBA,KAAKW,IAAIC,KAAM,SAAU,MACzBZ,KAAKW,IAAIE,KAAMb,KAAKc,SAAUd,KAAKD,UAGnCO,OAAOS,SAAWf,KAAKe,SAAW,GAAIpC,GAASqC,eAAgBd,EAAEhB,OAAQc,KAAKD,QAAQkB,QAClF5B,GAAIW,KAAKS,EAAG,aAAcS,IAAI,MAG9BlB,KAAKD,QAAQN,qBACbO,KAAKmB,WAAYnB,KAAKD,QAAQL,oBAAqBM,KAAKD,QAAQJ,mBAEhEK,KAAKD,QAAQH,yBACbI,KAAKoB,kBAAmBpB,KAAKD,QAAQF,wBAGzCG,KAAKqB,eACErB,MAIXmB,WAAa,SAAUG,EAASC,GAQ5B,MAPAD,GAAUA,GAAW,GACrBC,EAAQA,GAAS,OACjBvB,KAAKW,IAAIa,SAAU,mBACnBxB,KAAKS,EAAG,eACHG,KAAM,QAAS,SAAWW,EAAQ,YAClCV,KAAMS,GACNG,SAAUH,GACRtB,MAIXoB,kBAAoB,SAAUE,GAC1B,GAAII,GAAmB,YAAcpB,OAAOqB,KAAO,oDAMnD,OALA3B,MAAKW,IAAIa,SAAU,sBACnBxB,KAAKS,EAAG,gBACHI,KAAMS,GACNM,OAAQ,IAAMF,GACdD,SAAUH,GACRtB,MAIXqB,aAAe,WACX,GAAIQ,GAAO7B,IAUX,OARAS,GAAG,8BAA+BqB,SAClC9B,KAAKT,UAAUwC,QAAS,SAAUC,GAC9B,GAAI9B,EAAE+B,IAAKJ,EAAMG,GAAW,CACxB,GAAIE,GAAYL,EAAMG,EACtBE,GAAUC,WAAY,IAAMH,GAC5BE,EAAUxB,YAGXV,MAKXc,SAAU,WAEN,OACI,gGACI,yBACA,2EACA,qDACA,oFAGAd,KAAKoC,KAAQ,mBAAqB,GAClCpC,KAAKqC,OAAQ,qCAAuC,GACpDrC,KAAKsC,MAAQ,oBAAsB,GACvC,SAEA,oDAEA,aACI,4DACI,QACI,wDACA,QACI,gFACA,iDACJ,SACJ,SACJ,SACJ,eACFC,KAAK,KAGXC,eAAiB,WACTxC,KAAKoC,MACLpC,KAAKoC,KAAKK,OAEVzC,KAAKsC,OACLtC,KAAKsC,MAAMG,QAInBC,SAAW,WAAY,MAAO,mBAI9B,QACI3D,eAAgBA"}
|
||||
@@ -1 +1 @@
|
||||
{"version":3,"file":"polyfills.js","sources":["../src/polyfills.js"],"names":["lastTime","vendors","x","length","window","requestAnimationFrame","cancelRequestAnimationFrame","callback","currTime","Date","getTime","timeToCall","Math","max","id","setTimeout","cancelAnimationFrame","clearTimeout"],"mappings":"CAAA,WACI,YAMA,KAAI,GAFAA,GAAW,EACXC,GAAW,KAAM,MAAO,SAAU,KAC9BC,EAAI,EAAGA,EAAID,EAAQE,SAAWC,OAAOC,wBAAyBH,EAClEE,OAAOC,sBAAwBD,OAAOH,EAAQC,GAAG,yBACjDE,OAAOE,4BAA8BF,OAAOH,EAAQC,GAClD,8BAGDE,QAAOC,wBACRD,OAAOC,sBAAwB,SAASE,GACpC,GAAIC,IAAW,GAAIC,OAAOC,UACtBC,EAAaC,KAAKC,IAAI,EAAG,IAAML,EAAWR,IAC1Cc,EAAKV,OAAOW,WAAW,WAAaR,EAASC,EAAWG,IAC1DA,EAEF,OADAX,GAAWQ,EAAWG,EACfG,IAGVV,OAAOY,uBACRZ,OAAOY,qBAAuB,SAASF,GACnCG,aAAaH"}
|
||||
{"version":3,"file":"polyfills.js","sources":["../src/polyfills.js"],"names":["Object","assign","_","extend","lastTime","vendors","x","length","window","requestAnimationFrame","cancelRequestAnimationFrame","callback","currTime","Date","getTime","timeToCall","Math","max","id","setTimeout","cancelAnimationFrame","clearTimeout"],"mappings":"AACAA,OAAOC,OAASD,OAAOC,QAAUC,EAAEC,OAEnC,WACI,YAMA,KAAI,GAFAC,GAAW,EACXC,GAAW,KAAM,MAAO,SAAU,KAC9BC,EAAI,EAAGA,EAAID,EAAQE,SAAWC,OAAOC,wBAAyBH,EAClEE,OAAOC,sBAAwBD,OAAOH,EAAQC,GAAG,yBACjDE,OAAOE,4BAA8BF,OAAOH,EAAQC,GAClD,8BAGDE,QAAOC,wBACRD,OAAOC,sBAAwB,SAASE,GACpC,GAAIC,IAAW,GAAIC,OAAOC,UACtBC,EAAaC,KAAKC,IAAI,EAAG,IAAML,EAAWR,IAC1Cc,EAAKV,OAAOW,WAAW,WAAaR,EAASC,EAAWG,IAC1DA,EAEF,OADAX,GAAWQ,EAAWG,EACfG,IAGVV,OAAOY,uBACRZ,OAAOY,qBAAuB,SAASF,GACnCG,aAAaH"}
|
||||
@@ -1 +1 @@
|
||||
{"version":3,"file":"localization.js","sources":["../../src/utils/localization.js"],"names":["define","localeStrings","hasOwnProperty","locale","navigator","language","userLanguage","toLowerCase","__root","console","debug","localize","strToLocalize","cacheNonLocalized"],"mappings":"AAAAA,QACI,mBACD,SAAUC,GAOb,GAAIA,EAAcC,eAAgB,UAAY,CAC1C,GAAIC,GACqB,mBAAdC,WAA4B,UAC3BA,UAAUC,UAAYD,UAAUE,cAAgB,UAAWC,aAEvEN,GAAgBA,EAAe,KAAOE,IAAYF,EAAcO,OAChEC,QAAQC,MAAO,oCAAsCP,EAAS,eAG9DM,SAAQC,MAAO,mCAAqCP,EAAS,UAUjE,IAAIQ,GAAW,SAAUC,GAcrB,MAAOX,GAAeW,IAAmBA,EAMzC,OAJJD,GAASE,mBAAoB,EAIlBF"}
|
||||
{"version":3,"file":"localization.js","sources":["../../src/utils/localization.js"],"names":["define","localeStrings","hasOwnProperty","locale","navigator","language","userLanguage","toLowerCase","__root","localize","strToLocalize","cacheNonLocalized"],"mappings":"AAAAA,QACI,mBACD,SAAUC,GAOb,GAAIA,EAAcC,eAAgB,UAAY,CAE1C,GAAIC,GACqB,mBAAdC,WAA4B,UAC3BA,UAAUC,UAAYD,UAAUE,cAAgB,UAAWC,aAEvEN,GAAgBA,EAAe,KAAOE,IAAYF,EAAcO,OAapE,GAAIC,GAAW,SAAUC,GAcrB,MAAOT,GAAeS,IAAmBA,EAMzC,OAJJD,GAASE,mBAAoB,EAIlBF"}
|
||||
@@ -141,7 +141,8 @@ webpackJsonp([0],[
|
||||
layout : options.toolbox_in_panel
|
||||
});
|
||||
this.tool_panel_view = new Tools.ToolPanelView({ model: this.tool_panel });
|
||||
// add upload plugin
|
||||
|
||||
// add upload modal
|
||||
this.uploadButton = new Upload( options );
|
||||
}
|
||||
},
|
||||
@@ -761,9 +762,7 @@ webpackJsonp([0],[
|
||||
Galaxy.upload.show();
|
||||
});
|
||||
}
|
||||
|
||||
// regular tools
|
||||
if ( this.model.id !== 'upload1' && this.model.get( 'model_class' ) === 'Tool' ) {
|
||||
else if ( this.model.get( 'model_class' ) === 'Tool' ) { // regular tools
|
||||
var self = this;
|
||||
$link.find('a').on('click', function(e) {
|
||||
e.preventDefault();
|
||||
@@ -15651,7 +15650,7 @@ webpackJsonp([0],[
|
||||
|
||||
render : function(){
|
||||
RightPanel.prototype.render.call( this );
|
||||
this.debug( 'rendering:' );
|
||||
this.$( '.unified-panel-header' ).addClass( 'history-panel-header' );
|
||||
this.$( '.panel-header-buttons' ).append([
|
||||
this.refreshButton.$el,
|
||||
this.optionsButton.$el,
|
||||
@@ -17938,7 +17937,7 @@ webpackJsonp([0],[
|
||||
constructor : function( attrs, options ){
|
||||
hcontentMixin.constructor.call( this, attrs, options );
|
||||
},
|
||||
|
||||
|
||||
/** default attributes for a model */
|
||||
defaults : _.extend( {}, _super.prototype.defaults, hcontentMixin.defaults, {
|
||||
model_class : 'HistoryDatasetAssociation'
|
||||
@@ -27780,6 +27779,9 @@ webpackJsonp([0],[
|
||||
this.log( this + '.initialize:', options );
|
||||
_.extend( this, _.pick( options, this._panelIds ) );
|
||||
this.options = _.defaults( _.omit( options, this._panelIds ), this.defaultOptions );
|
||||
|
||||
// TODO: remove globals
|
||||
Galaxy.modal = this.modal = new MODAL.View();
|
||||
},
|
||||
|
||||
/** */
|
||||
@@ -27792,13 +27794,10 @@ webpackJsonp([0],[
|
||||
this.$el.attr( 'scroll', 'no' );
|
||||
this.$el.html( this.template( this.options ) );
|
||||
|
||||
this.modal = new MODAL.View();
|
||||
//TODO: no render on masthead, needs init each time
|
||||
this.masthead = new MASTHEAD.GalaxyMasthead( this.options.config );
|
||||
|
||||
// TODO: remove globals
|
||||
Galaxy.modal = this.modal;
|
||||
Galaxy.masthead = this.masthead;
|
||||
Galaxy.masthead = this.masthead = new MASTHEAD.GalaxyMasthead( _.extend( this.options.config, {
|
||||
el: this.$( '#masthead' ).get(0)
|
||||
}));
|
||||
|
||||
if( this.options.message_box_visible ){
|
||||
this.messageBox( this.options.message_box_content, this.options.message_box_class );
|
||||
@@ -27856,6 +27855,7 @@ webpackJsonp([0],[
|
||||
return [
|
||||
'<div id="everything" style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;">',
|
||||
'<div id="background"/>',
|
||||
'<div id="masthead" class="navbar navbar-fixed-top navbar-inverse"></div>',
|
||||
'<div id="messagebox" style="display: none;"></div>',
|
||||
'<div id="inactivebox" class="panel-warning-message" style="display: none;"></div>',
|
||||
// content here
|
||||
@@ -27938,10 +27938,8 @@ webpackJsonp([0],[
|
||||
$("body").off();
|
||||
|
||||
// define this element
|
||||
this.setElement($(this._template(options)));
|
||||
|
||||
// append to masthead
|
||||
$(this.el_masthead).append($(this.el));
|
||||
this.$el.html(this._template(options));
|
||||
$(this.el_masthead).find('#masthead').replaceWith(this.$el);
|
||||
|
||||
// assign background
|
||||
this.$background = $(this.el).find('#masthead-background');
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -161,7 +161,9 @@ webpackJsonp([3],{
|
||||
self.logger = new metricsLogger.MetricsLogger( loggerOptions );
|
||||
self.emit = {};
|
||||
[ 'log', 'debug', 'info', 'warn', 'error', 'metric' ].map(function( i ) {
|
||||
self.emit[ i ] = function( data ) { self.logger.emit( i, arguments[ 0 ], Array.prototype.slice.call( arguments, 1 ) ) };
|
||||
self.emit[ i ] = function( data ){
|
||||
self.logger.emit( i, arguments[ 0 ], Array.prototype.slice.call( arguments, 1 ) );
|
||||
};
|
||||
});
|
||||
|
||||
if( self.config.debug ){
|
||||
@@ -268,7 +270,6 @@ webpackJsonp([3],{
|
||||
return 'GalaxyApp(' + userEmail + ')';
|
||||
};
|
||||
|
||||
|
||||
// ============================================================================
|
||||
return {
|
||||
GalaxyApp : GalaxyApp
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -1,2 +1,2 @@
|
||||
define(["utils/utils","layout/menu","layout/scratchbook","mvc/user/user-quotameter"],function(a,b,c,d){var e=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 e=this;$(window).on("beforeunload",function(){var a="";for(var b in e.list)if(e.list[b].options.onunload){var c=e.list[b].options.onunload();c&&(a+=c+" ")}return""!==a?a:void 0}),this.menu=Galaxy.menu=new b.GalaxyMenu({masthead:this,config:this.options}),this.frame=Galaxy.frame=new c.GalaxyFrame({masthead:this}),Galaxy.quotaMeter=new d.UserQuotaMeter({model:Galaxy.user,el:this.$(".quota-meter-container")}).render()},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'<div><div id="masthead" class="navbar navbar-fixed-top navbar-inverse"><div style="position: relative; right: -50%; float: left;"><div id="navbar" style="display: block; position: relative; right: 50%;"></div></div><div class="navbar-brand"><a href="'+a.logo_url+'"><img style="margin-left: 0.35em;" border="0" src="'+Galaxy.root+'static/images/galaxyIcon_noText.png"><span id="brand"> Galaxy '+b+'</span></a></div><div class="quota-meter-container"></div><div id="iconbar" class="iconbar"></div></div><div id="masthead-background" style="display: none; position: absolute; top: 33px; width: 100%; height: 100%; z-index: 1010"></div></div>'}});return{GalaxyMasthead:e}});
|
||||
define(["utils/utils","layout/menu","layout/scratchbook","mvc/user/user-quotameter"],function(a,b,c,d){var e=Backbone.View.extend({el_masthead:"#everything",options:null,$background:null,list:[],initialize:function(a){this.options=a,$("body").off(),this.$el.html(this._template(a)),$(this.el_masthead).find("#masthead").replaceWith(this.$el),this.$background=$(this.el).find("#masthead-background");var e=this;$(window).on("beforeunload",function(){var a="";for(var b in e.list)if(e.list[b].options.onunload){var c=e.list[b].options.onunload();c&&(a+=c+" ")}return""!==a?a:void 0}),this.menu=Galaxy.menu=new b.GalaxyMenu({masthead:this,config:this.options}),this.frame=Galaxy.frame=new c.GalaxyFrame({masthead:this}),Galaxy.quotaMeter=new d.UserQuotaMeter({model:Galaxy.user,el:this.$(".quota-meter-container")}).render()},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'<div><div id="masthead" class="navbar navbar-fixed-top navbar-inverse"><div style="position: relative; right: -50%; float: left;"><div id="navbar" style="display: block; position: relative; right: 50%;"></div></div><div class="navbar-brand"><a href="'+a.logo_url+'"><img style="margin-left: 0.35em;" border="0" src="'+Galaxy.root+'static/images/galaxyIcon_noText.png"><span id="brand"> Galaxy '+b+'</span></a></div><div class="quota-meter-container"></div><div id="iconbar" class="iconbar"></div></div><div id="masthead-background" style="display: none; position: absolute; top: 33px; width: 100%; height: 100%; z-index: 1010"></div></div>'}});return{GalaxyMasthead:e}});
|
||||
//# sourceMappingURL=../../maps/layout/masthead.js.map
|
||||
@@ -1,2 +1,2 @@
|
||||
define(["layout/masthead","layout/panel","mvc/ui/ui-modal","mvc/base-mvc"],function(a,b,c,d){var e=Backbone.View.extend(d.LoggableMixin).extend({_logNamespace:"layout",el:"body",className:"full-content",_panelIds:["left","center","right"],defaultOptions:{message_box_visible:!1,message_box_content:"",message_box_class:"info",show_inactivity_warning:!1,inactivity_box_content:""},initialize:function(a){this.log(this+".initialize:",a),_.extend(this,_.pick(a,this._panelIds)),this.options=_.defaults(_.omit(a,this._panelIds),this.defaultOptions)},$everything:function(){return this.$("#everything")},render:function(){return this.log(this+".render:"),this.$el.attr("scroll","no"),this.$el.html(this.template(this.options)),this.modal=new c.View,this.masthead=new a.GalaxyMasthead(this.options.config),Galaxy.modal=this.modal,Galaxy.masthead=this.masthead,this.options.message_box_visible&&this.messageBox(this.options.message_box_content,this.options.message_box_class),this.options.show_inactivity_warning&&this.inactivityWarning(this.options.inactivity_box_content),this.renderPanels(),this},messageBox:function(a,b){return a=a||"",b=b||"info",this.$el.addClass("has-message-box"),this.$("#messagebox").attr("class","panel-"+b+"-message").html(a).toggle(!!a),this},inactivityWarning:function(a){var b='<a href="'+Galaxy.root+'user/resend_verification">Resend verification.</a>';return this.$el.addClass("has-inactivity-box"),this.$("#inactivebox").html(a).append(" "+b).toggle(!!a),this},renderPanels:function(){var a=this;return $(".select2-hidden-accessible").remove(),this._panelIds.forEach(function(b){if(_.has(a,b)){var c=a[b];c.setElement("#"+b),c.render()}}),this},template:function(){return['<div id="everything" style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;">','<div id="background"/>','<div id="messagebox" style="display: none;"></div>','<div id="inactivebox" class="panel-warning-message" style="display: none;"></div>',this.left?'<div id="left"/>':"",this.center?'<div id="center" class="inbound"/>':"",this.right?'<div id="right"/>':"","</div>",'<div id="dd-helper" style="display: none;"></div>',"<noscript>",'<div class="overlay overlay-background noscript-overlay">',"<div>",'<h3 class="title">Javascript Required for Galaxy</h3>',"<div>","The Galaxy analysis interface requires a browser with Javascript enabled.<br>","Please enable Javascript and refresh this page","</div>","</div>","</div>","</noscript>"].join("")},hideSidePanels:function(){this.left&&this.left.hide(),this.right&&this.right.hide()},toString:function(){return"PageLayoutView"}});return{PageLayoutView:e}});
|
||||
define(["layout/masthead","layout/panel","mvc/ui/ui-modal","mvc/base-mvc"],function(a,b,c,d){var e=Backbone.View.extend(d.LoggableMixin).extend({_logNamespace:"layout",el:"body",className:"full-content",_panelIds:["left","center","right"],defaultOptions:{message_box_visible:!1,message_box_content:"",message_box_class:"info",show_inactivity_warning:!1,inactivity_box_content:""},initialize:function(a){this.log(this+".initialize:",a),_.extend(this,_.pick(a,this._panelIds)),this.options=_.defaults(_.omit(a,this._panelIds),this.defaultOptions),Galaxy.modal=this.modal=new c.View},$everything:function(){return this.$("#everything")},render:function(){return this.log(this+".render:"),this.$el.attr("scroll","no"),this.$el.html(this.template(this.options)),Galaxy.masthead=this.masthead=new a.GalaxyMasthead(_.extend(this.options.config,{el:this.$("#masthead").get(0)})),this.options.message_box_visible&&this.messageBox(this.options.message_box_content,this.options.message_box_class),this.options.show_inactivity_warning&&this.inactivityWarning(this.options.inactivity_box_content),this.renderPanels(),this},messageBox:function(a,b){return a=a||"",b=b||"info",this.$el.addClass("has-message-box"),this.$("#messagebox").attr("class","panel-"+b+"-message").html(a).toggle(!!a),this},inactivityWarning:function(a){var b='<a href="'+Galaxy.root+'user/resend_verification">Resend verification.</a>';return this.$el.addClass("has-inactivity-box"),this.$("#inactivebox").html(a).append(" "+b).toggle(!!a),this},renderPanels:function(){var a=this;return $(".select2-hidden-accessible").remove(),this._panelIds.forEach(function(b){if(_.has(a,b)){var c=a[b];c.setElement("#"+b),c.render()}}),this},template:function(){return['<div id="everything" style="position: absolute; top: 0; left: 0; width: 100%; height: 100%;">','<div id="background"/>','<div id="masthead" class="navbar navbar-fixed-top navbar-inverse"></div>','<div id="messagebox" style="display: none;"></div>','<div id="inactivebox" class="panel-warning-message" style="display: none;"></div>',this.left?'<div id="left"/>':"",this.center?'<div id="center" class="inbound"/>':"",this.right?'<div id="right"/>':"","</div>",'<div id="dd-helper" style="display: none;"></div>',"<noscript>",'<div class="overlay overlay-background noscript-overlay">',"<div>",'<h3 class="title">Javascript Required for Galaxy</h3>',"<div>","The Galaxy analysis interface requires a browser with Javascript enabled.<br>","Please enable Javascript and refresh this page","</div>","</div>","</div>","</noscript>"].join("")},hideSidePanels:function(){this.left&&this.left.hide(),this.right&&this.right.hide()},toString:function(){return"PageLayoutView"}});return{PageLayoutView:e}});
|
||||
//# sourceMappingURL=../../maps/layout/page.js.map
|
||||
@@ -1,2 +1,2 @@
|
||||
!function(){"use strict";for(var a=0,b=["ms","moz","webkit","o"],c=0;c<b.length&&!window.requestAnimationFrame;++c)window.requestAnimationFrame=window[b[c]+"RequestAnimationFrame"],window.cancelRequestAnimationFrame=window[b[c]+"CancelRequestAnimationFrame"];window.requestAnimationFrame||(window.requestAnimationFrame=function(b){var c=(new Date).getTime(),d=Math.max(0,16-(c-a)),e=window.setTimeout(function(){b(c+d)},d);return a=c+d,e}),window.cancelAnimationFrame||(window.cancelAnimationFrame=function(a){clearTimeout(a)})}();
|
||||
Object.assign=Object.assign||_.extend,function(){"use strict";for(var a=0,b=["ms","moz","webkit","o"],c=0;c<b.length&&!window.requestAnimationFrame;++c)window.requestAnimationFrame=window[b[c]+"RequestAnimationFrame"],window.cancelRequestAnimationFrame=window[b[c]+"CancelRequestAnimationFrame"];window.requestAnimationFrame||(window.requestAnimationFrame=function(b){var c=(new Date).getTime(),d=Math.max(0,16-(c-a)),e=window.setTimeout(function(){b(c+d)},d);return a=c+d,e}),window.cancelAnimationFrame||(window.cancelAnimationFrame=function(a){clearTimeout(a)})}();
|
||||
//# sourceMappingURL=../maps/polyfills.js.map
|
||||
@@ -1,2 +1,2 @@
|
||||
define(["i18n!nls/locale"],function(a){if(a.hasOwnProperty("__root")){var b="undefined"==typeof navigator?"__root":(navigator.language||navigator.userLanguage||"__root").toLowerCase();a=a["__"+b]||a.__root,console.debug("amdi18n+webpack localization for "+b+" loaded")}else console.debug("i18n+requirejs localization for "+b+" loaded");var c=function(b){return a[b]||b};return c.cacheNonLocalized=!1,c});
|
||||
define(["i18n!nls/locale"],function(a){if(a.hasOwnProperty("__root")){var b="undefined"==typeof navigator?"__root":(navigator.language||navigator.userLanguage||"__root").toLowerCase();a=a["__"+b]||a.__root}var c=function(b){return a[b]||b};return c.cacheNonLocalized=!1,c});
|
||||
//# sourceMappingURL=../../maps/utils/localization.js.map
|
||||
@@ -1,24 +0,0 @@
|
||||
#masthead
|
||||
{
|
||||
display: none;
|
||||
}
|
||||
|
||||
#messagebox
|
||||
{
|
||||
display: none;
|
||||
}
|
||||
|
||||
#center
|
||||
{
|
||||
top: 0 !important;
|
||||
}
|
||||
|
||||
#right
|
||||
{
|
||||
top: 0 !important;
|
||||
}
|
||||
|
||||
#left
|
||||
{
|
||||
top: 0 !important;
|
||||
}
|
||||
@@ -59,10 +59,6 @@
|
||||
<script type="text/javascript">
|
||||
## global configuration object
|
||||
|
||||
//## load additional style sheet
|
||||
//if (window != window.top)
|
||||
// $('<link href="' + Galaxy.root + 'static/style/galaxy.frame.masthead.css" rel="stylesheet">').appendTo('head');
|
||||
|
||||
// console protection
|
||||
window.console = window.console || {
|
||||
log : function(){},
|
||||
|
||||
@@ -23,9 +23,10 @@
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
|
||||
## TODO: use loaders to move everything but the essentials below the fold
|
||||
${ h.css(
|
||||
'base',
|
||||
'jquery.rating',
|
||||
'jquery-ui/smoothness/jquery-ui'
|
||||
'jquery-ui/smoothness/jquery-ui',
|
||||
## base needs to come after jquery-ui because of ui-button, ui- etc. name collision
|
||||
'base',
|
||||
)}
|
||||
${ page_setup() }
|
||||
</head>
|
||||
|
||||
@@ -40,11 +40,22 @@
|
||||
Galaxy = {};
|
||||
}
|
||||
|
||||
## load additional style sheet
|
||||
if (window != window.top){
|
||||
$('<link href="' + Galaxy.root + 'static/style/galaxy.frame.masthead.css" rel="stylesheet">')
|
||||
.appendTo('head');
|
||||
// if we're in an iframe, create styles that hide masthead/messagebox, and reset top for panels
|
||||
// note: don't use a link to avoid roundtrip request
|
||||
// note: we can't select here because the page (incl. messgaebox, center, etc.) isn't fully rendered
|
||||
// TODO: remove these when we no longer navigate with iframes
|
||||
var in_iframe = window !== window.top;
|
||||
if( in_iframe ){
|
||||
var styleElement = document.createElement( 'style' );
|
||||
document.head.appendChild( styleElement );
|
||||
[
|
||||
'#masthead, #messagebox { display: none; }',
|
||||
'#center, #right, #left { top: 0 !important; }',
|
||||
].forEach( function( rule ){
|
||||
styleElement.sheet.insertRule( rule, 0 );
|
||||
});
|
||||
}
|
||||
// TODO: ?? move above to base_panels.mako?
|
||||
|
||||
## load galaxy js-modules
|
||||
require([
|
||||
|
||||
@@ -170,7 +170,6 @@ spaceghost.test.begin( 'Test permissions for accessible, published, and inaccess
|
||||
});
|
||||
this.debug( this.jsonStr( returned ) );
|
||||
}, 403, 'History is not accessible by user', 'hda copy from failed with error' );
|
||||
|
||||
}
|
||||
|
||||
function testWriteFunctions( history, hdas ){
|
||||
@@ -256,7 +255,7 @@ spaceghost.test.begin( 'Test permissions for accessible, published, and inaccess
|
||||
testInaccessible.call( spaceghost, accessibleHistory, accessibleHdas );
|
||||
testInaccessible.call( spaceghost, publishedHistory, publishedHdas );
|
||||
});
|
||||
spaceghost.user.logout();
|
||||
// spaceghost.user.logout();
|
||||
|
||||
|
||||
// ===================================================================
|
||||
|
||||
Reference in New Issue
Block a user