diff --git a/client/galaxy/scripts/galaxy-app-base.js b/client/galaxy/scripts/galaxy-app-base.js
index 1a2f20532be..cbcfb806775 100644
--- a/client/galaxy/scripts/galaxy-app-base.js
+++ b/client/galaxy/scripts/galaxy-app-base.js
@@ -143,7 +143,38 @@ GalaxyApp.prototype._setUpListeners = function _setUpListeners(){
};
//TODO:?? we might somehow manage to *retry* ajax using either this hook or Backbone.sync
});
+ self._listenToGalaxyMain();
+ return self;
+};
+/** trigger an event when the main frame loads a new page */
+GalaxyApp.prototype._listenToGalaxyMain = function _listenToGalaxyMain(){
+ var self = this,
+ selector = 'iframe#galaxy_main',
+ galaxy_main = $( selector );
+ galaxy_main = galaxy_main.size()? galaxy_main.get( 0 ).contentWindow : undefined ;
+ if( galaxy_main ){
+ // TODO: this would be better external to this function so it can be removed
+ var handler = function __galaxyMainOnLoadHandler( ev ){
+ try {
+ var _galaxy_main = $( selector ).get( 0 ).contentWindow,
+ full = _galaxy_main.location.pathname + _galaxy_main.location.search + _galaxy_main.location.hash;
+ self.trigger( 'galaxy_main:load', {
+ fullpath: full,
+ pathname: _galaxy_main.location.pathname,
+ search : _galaxy_main.location.search,
+ hash : _galaxy_main.location.hash
+ });
+
+ } catch( err ){
+ self.debug( 'Error handling main frame load:', err );
+ }
+ };
+ $( selector ).on( 'load', handler );
+
+ } else {
+ self.debug( 'No galaxy_main found' );
+ }
};
/** string rep */
diff --git a/client/galaxy/scripts/mvc/history/history-panel-edit-current.js b/client/galaxy/scripts/mvc/history/history-panel-edit-current.js
index 81be7ad8367..e7dbe3f7203 100644
--- a/client/galaxy/scripts/mvc/history/history-panel-edit-current.js
+++ b/client/galaxy/scripts/mvc/history/history-panel-edit-current.js
@@ -124,7 +124,7 @@ var CurrentHistoryPanel = _super.extend(
//});
};
return this.loadHistoryWithDetails( historyId, attributes, historyFn )
- .then(function( historyData, contentsData ){
+ .then( function( historyData, contentsData ){
panel.trigger( 'switched-history', panel );
});
},
@@ -293,11 +293,9 @@ var CurrentHistoryPanel = _super.extend(
/** Override to add the current-content highlight class to currentContentId's view */
_attachItems : function( $whereTo ){
_super.prototype._attachItems.call( this, $whereTo );
- var panel = this,
- currentContentView;
- if( panel.currentContentId
- && ( currentContentView = panel.viewFromModelId( panel.currentContentId ) ) ){
- panel.setCurrentContent( currentContentView );
+ var panel = this;
+ if( panel.currentContentId ){
+ panel._setCurrentContentById( panel.currentContentId );
}
return this;
},
@@ -325,9 +323,9 @@ var CurrentHistoryPanel = _super.extend(
}, this );
// when content is manipulated, make it the current-content
- view.on( 'display edit params rerun report-err visualize', function( v, ev ){
- this.setCurrentContent( v );
- }, this );
+ // view.on( 'visualize', function( v, ev ){
+ // this.setCurrentContent( v );
+ // }, this );
return this;
},
@@ -343,6 +341,12 @@ var CurrentHistoryPanel = _super.extend(
}
},
+ /** find the view with the id and then call setCurrentContent on it */
+ _setCurrentContentById : function( id ){
+ var view = this.viewFromModelId( id ) || null;
+ this.setCurrentContent( view );
+ },
+
/** Handle drill down by hiding this panels list and controls and showing the sub-panel */
_expandDrilldownPanel : function( drilldown ){
this.panelStack.push( drilldown );
@@ -360,6 +364,36 @@ var CurrentHistoryPanel = _super.extend(
},
// ........................................................................ external objects/MVC
+ listenToGalaxy : function( galaxy ){
+ // TODO: MEM: questionable reference island / closure practice
+ galaxy.on( 'galaxy_main:load', function( data ){
+ var pathToMatch = data.fullpath,
+ useToURLRegexMap = {
+ 'display' : /datasets\/([a-f0-9]+)\/display/,
+ 'edit' : /datasets\/([a-f0-9]+)\/edit/,
+ 'report_error' : /dataset\/errors\?id=([a-f0-9]+)/,
+ 'rerun' : /tool_runner\/rerun\?id=([a-f0-9]+)/,
+ 'show_params' : /datasets\/([a-f0-9]+)\/show_params/,
+ // no great way to do this here? (leave it in the dataset event handlers above?)
+ // 'visualization' : 'visualization',
+ },
+ hdaId = null,
+ hdaUse = null;
+ _.find( useToURLRegexMap, function( regex, use ){
+ var match = pathToMatch.match( regex );
+ if( match && match.length == 2 ){
+ hdaId = match[1];
+ hdaUse = use;
+ return true;
+ }
+ return false;
+ });
+ // need to type mangle to go from web route to history contents
+ hdaId = 'dataset-' + hdaId;
+ this._setCurrentContentById( hdaId );
+ }, this );
+ },
+
//TODO: remove quota meter from panel and remove this
/** add listeners to an external quota meter (mvc/user/user-quotameter.js) */
connectToQuotaMeter : function( quotaMeter ){
diff --git a/static/maps/galaxy-app-base.js.map b/static/maps/galaxy-app-base.js.map
index c363142deca..4bd4bbdce7f 100644
--- a/static/maps/galaxy-app-base.js.map
+++ b/static/maps/galaxy-app-base.js.map
@@ -1 +1 @@
-{"version":3,"file":"galaxy-app-base.js","sources":["../src/galaxy-app-base.js"],"names":["define","userModel","metricsLogger","addLogging","localize","bootstrapped","GalaxyApp","options","self","this","_init","prototype","defaultOptions","patchExisting","root","_","extend","Backbone","Events","_processOptions","debug","_patchGalaxy","window","Galaxy","_initLogger","loggerOptions","logger","_initLocale","config","_initUser","user","trigger","_setUpListeners","defaults","k","hasOwnProperty","patchWith","MetricsLogger","_l","userJSON","User","currUser","lastAjax","$","document","bind","ev","xhr","data","JSON","parse","err","url","location","href","slice","toString","userEmail","get"],"mappings":"AAAAA,QACI,sBACA,uBACA,oBACA,qBACA,qBACD,SAAUC,EAAWC,EAAeC,EAAYC,EAAUC,GAU7D,QAASC,GAAWC,GAChB,GAAIC,GAAOC,IACX,OAAOD,GAAKE,MAAOH,OA0InB,MAtIJJ,GAAYG,EAAW,aAGvBA,EAAUK,UAAUC,gBAEhBC,eAAkB,EAGlBC,KAAkB,KAItBR,EAAUK,UAAUD,MAAQ,SAAeH,GACvC,GAAIC,GAAOC,IA4BX,OA3BAM,GAAEC,OAAQR,EAAMS,SAASC,QAEzBV,EAAKW,gBAAiBZ,GACtBC,EAAKY,MAAO,sBAAuBZ,EAAKD,SAExCC,EAAKa,aAAcC,OAAOC,QAE1Bf,EAAKgB,YAAajB,EAAQkB,mBAC1BjB,EAAKY,MAAO,qBAAsBZ,EAAKkB,QAEvClB,EAAKmB,cACLnB,EAAKY,MAAO,uBAAwBZ,EAAKJ,UAEzCI,EAAKoB,OAASrB,EAAQqB,QAAUvB,EAAauB,WAC7CpB,EAAKY,MAAO,qBAAsBZ,EAAKoB,QAEvCpB,EAAKqB,UAAWtB,EAAQuB,MAAQzB,EAAayB,UAC7CtB,EAAKY,MAAO,mBAAoBZ,EAAKsB,MAGrCtB,EAAKuB,QAAS,QAASvB,GAKvBA,EAAKwB,kBAEExB,GAIXF,EAAUK,UAAUQ,gBAAkB,SAA0BZ,GAC5D,GAAIC,GAAOC,KACPwB,EAAWzB,EAAKI,cACpBJ,GAAKY,MAAO,oBAAqBb,GAEjCC,EAAKD,UACL,KAAK,GAAI2B,KAAKD,GACNA,EAASE,eAAgBD,KACzB1B,EAAKD,QAAS2B,GAAQ3B,EAAQ4B,eAAgBD,GAAQ3B,EAAS2B,GAAQD,EAAUC,GAGzF,OAAO1B,IAIXF,EAAUK,UAAUU,aAAe,SAA0Be,GACzD,GAAI5B,GAAOC,IAEX,IAAID,EAAKD,QAAQM,eAAiBuB,EAAW,CACzC5B,EAAKY,MAAO,gCAAiCgB,EAG7C,KAAK,GAAIF,KAAKE,GACNA,EAAUD,eAAgBD,KAC1B1B,EAAKY,MAAO,iBAAoBc,EAAI,cACpC1B,EAAM0B,GAAME,EAAWF,MAOvC5B,EAAUK,UAAUa,YAAc,SAAsBC,GACpD,GAAIjB,GAAOC,IAGX,OAFAD,GAAKY,MAAO,eAAgBK,GAC5BjB,EAAKkB,OAAS,GAAIxB,GAAcmC,cAAeZ,GACxCjB,GAIXF,EAAUK,UAAUgB,YAAc,SAAsBpB,GACpD,GAAIC,GAAOC,IAKX,OAJAD,GAAKY,MAAO,eAAgBb,GAC5BC,EAAKJ,SAAWA,EAEhBkB,OAAOgB,GAAK9B,EAAKJ,SACVI,GAIXF,EAAUK,UAAUkB,UAAY,SAAoBU,GAChD,GAAI/B,GAAOC,IAKX,OAJAD,GAAKY,MAAO,aAAcmB,GAC1B/B,EAAKsB,KAAO,GAAI7B,GAAUuC,KAAMD,GAEhC/B,EAAKiC,SAAWjC,EAAKsB,KACdtB,GAIXF,EAAUK,UAAUqB,gBAAkB,WAClC,GAAIxB,GAAOC,IAIXD,GAAKkC,YACLC,EAAGC,UAAWC,KAAM,WAAY,SAAUC,EAAIC,EAAKxC,GAC/C,GAAIyC,GAAOzC,EAAQyC,IACnB,KACIA,EAAOC,KAAKC,MAAOF,GACrB,MAAOG,IAET3C,EAAKkC,UACDU,IAAUC,SAASC,KAAKC,MAAO,EAAG,IAAOhD,EAAQ6C,IACjDJ,KAAUA,MAQtB1C,EAAUK,UAAU6C,SAAW,WAC3B,GAAIC,GAAYhD,KAAKqB,KAAK4B,IAAK,UAAa,aAC5C,OAAO,aAAeD,EAAY,MAM9BnD,UAAYA"}
\ No newline at end of file
+{"version":3,"file":"galaxy-app-base.js","sources":["../src/galaxy-app-base.js"],"names":["define","userModel","metricsLogger","addLogging","localize","bootstrapped","GalaxyApp","options","self","this","_init","prototype","defaultOptions","patchExisting","root","_","extend","Backbone","Events","_processOptions","debug","_patchGalaxy","window","Galaxy","_initLogger","loggerOptions","logger","_initLocale","config","_initUser","user","trigger","_setUpListeners","defaults","k","hasOwnProperty","patchWith","MetricsLogger","_l","userJSON","User","currUser","lastAjax","$","document","bind","ev","xhr","data","JSON","parse","err","url","location","href","slice","_listenToGalaxyMain","selector","galaxy_main","size","get","contentWindow","undefined","handler","_galaxy_main","full","pathname","search","hash","fullpath","on","toString","userEmail"],"mappings":"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"}
\ No newline at end of file
diff --git a/static/maps/mvc/history/history-panel-edit-current.js.map b/static/maps/mvc/history/history-panel-edit-current.js.map
index d0e9d1628de..ab17a74b06b 100644
--- a/static/maps/mvc/history/history-panel-edit-current.js.map
+++ b/static/maps/mvc/history/history-panel-edit-current.js.map
@@ -1 +1 @@
-{"version":3,"file":"history-panel-edit-current.js","sources":["../../../src/mvc/history/history-panel-edit-current.js"],"names":["define","HISTORY_MODEL","HPANEL_EDIT","DC_PANEL","BASE_MVC","_l","HistoryPanelPrefs","SessionStorageModel","extend","defaults","tagsEditorShown","annotationEditorShown","scrollPosition","toString","JSON","stringify","this","toJSON","storageKey","_super","HistoryPanelEdit","CurrentHistoryPanel","className","prototype","emptyMsg","noneFoundMsg","HDCAViewClass","foldoutStyle","initialize","attributes","preferences","_","id","pick","keys","call","panelStack","currentContentId","_setUpListeners","panel","$scrollContainer","on","$el","is","set","$","scrollTop","loadCurrentHistory","debug","loadHistoryWithDetails","then","trigger","switchToHistory","historyId","historyFn","jQuery","getJSON","galaxy_config","root","createNewHistory","Galaxy","currUser","isAnonymous","displayMessage","when","loadHistory","undefined","setModel","model","render","log","checkForUpdates","_setUpCollectionListeners","collection","get","storage","removeItemView","_setUpModelListeners","quotaMeter","listenTo","update","_buildNewRender","$newRender","find","prependTo","_renderQuotaMessage","$whereTo","templates","quotaMsg","_renderEmptyMessage","$emptyMsg","$emptyMessage","$toolMenu","isEmpty","views","searchFor","upload","size","empty","html","join","click","ev","show","parent","_renderTags","$where","tagsEditor","toggle","hidden","_renderAnnotation","annotationEditor","_swapNewRender","delay","pos","scrollTo","_attachItems","currentContentView","viewFromModelId","setCurrentContent","addItemView","options","view","length","_collapseDrilldownPanel","_setUpItemViewListeners","v","drilldown","_expandDrilldownPanel","removeClass","addClass","push","add","$list","hide","parentName","append","pop","connectToQuotaMeter","showQuotaMessage","hideQuotaMessage","isOverQuota","clearMessages","$target","isUndefined","$messages","children","currentTarget","not","fadeOut","fxSpeed","remove","$msg","slideDown","slideUp","quotaMsgTemplate","wrapTemplate","clone"],"mappings":"AAAAA,QACI,4BACA,iCACA,kCACA,eACA,sBACD,SAAUC,EAAeC,EAAaC,EAAUC,EAAUC,GAI7D,GAAIC,GAAoBF,EAASG,oBAAoBC,QAEjDC,UAEIC,iBAAkB,EAElBC,uBAAwB,EAMxBC,eAAiB,GAErBC,SAAW,WACP,MAAO,qBAAuBC,KAAKC,UAAWC,KAAKC,UAAa,MAKxEX,GAAkBY,WAAa,WAC3B,MAAO,gBAOX,IAAIC,GAASjB,EAAYkB,iBASrBC,EAAsBF,EAAOX,QAM7Bc,UAAsBH,EAAOI,UAAUD,UAAY,yBAEnDE,SAAsBnB,EAAI,0EAC1BoB,aAAsBpB,EAAI,8BAG1BqB,cAAsBP,EAAOI,UAAUG,cAAclB,QACjDmB,aAAe,cAKnBC,WAAa,SAAUC,GACnBA,EAAaA,MAIbb,KAAKc,YAAc,GAAIxB,GAAmByB,EAAEvB,QACxCwB,GAAK1B,EAAkBY,cACxBa,EAAEE,KAAMJ,EAAYE,EAAEG,KAAM5B,EAAkBiB,UAAUd,aAE3DU,EAAOI,UAAUK,WAAWO,KAAMnB,KAAMa,GAGxCb,KAAKoB,cAGLpB,KAAKqB,iBAAmBR,EAAWQ,kBAAoB,MAK3DC,gBAAkB,WACdnB,EAAOI,UAAUe,gBAAgBH,KAAMnB,KAEvC,IAAIuB,GAAQvB,IAEZA,MAAKwB,mBAAmBC,GAAI,SAAU,WAC9BF,EAAMG,IAAIC,GAAI,aACdJ,EAAMT,YAAYc,IAAK,iBAAkBC,EAAG7B,MAAO8B,eAM3D9B,KAAKyB,GAAI,YAAa,WAClBF,EAAMT,YAAYc,IAAK,iBAAkB,MAMjDG,mBAAqB,SAAUlB,GAC3Bb,KAAKgC,MAAOhC,KAAO,sBAEnB,IAAIuB,GAAQvB,IACZ,OAAOA,MAAKiC,uBAAwB,UAAWpB,GAC1CqB,KAAK,WACFX,EAAMY,QAAS,kBAAmBZ,MAK9Ca,gBAAkB,SAAUC,EAAWxB,GAEnC,GAAIU,GAAQvB,KACRsC,EAAY,WAER,MAAOC,QAAOC,QAASC,cAAcC,KAAO,6BAA+BL,GAInF,OAAOrC,MAAKiC,uBAAwBI,EAAWxB,EAAYyB,GACtDJ,KAAK,WACFX,EAAMY,QAAS,mBAAoBZ,MAK/CoB,iBAAmB,SAAU9B,GACzB,IAAK+B,SAAWA,OAAOC,UAAYD,OAAOC,SAASC,cAE/C,MADA9C,MAAK+C,eAAgB,QAAS1D,EAAI,8CAC3BwC,EAAEmB,MAEb,IAAIzB,GAAQvB,KACRsC,EAAY,WAER,MAAOC,QAAOC,QAASC,cAAcC,KAAO,8BAKpD,OAAO1C,MAAKiD,YAAaC,OAAWrC,EAAYyB,GAC3CJ,KAAK,WACFX,EAAMY,QAAS,cAAeZ,MAK1C4B,SAAW,SAAUC,EAAOvC,EAAYwC,GAMpC,MALAlD,GAAOI,UAAU4C,SAAShC,KAAMnB,KAAMoD,EAAOvC,EAAYwC,GACrDrD,KAAKoD,QACLpD,KAAKsD,IAAK,wBACVtD,KAAKoD,MAAMG,mBAERvD,MAKXwD,0BAA4B,WACxBrD,EAAOI,UAAUiD,0BAA0BrC,KAAMnB,MAKjDA,KAAKyD,WAAWhC,GAAI,cAAe,SAAU2B,GAClCA,EAAMM,IAAK,YACX1D,KAAK2D,QAAQD,IAAK,gBACrB1D,KAAK4D,eAAgBR,IAE1BpD,OAIP6D,qBAAuB,WACnB1D,EAAOI,UAAUsD,qBAAqB1C,KAAMnB,MAIxC4C,QAAUA,OAAOkB,YACjB9D,KAAK+D,SAAU/D,KAAKoD,MAAO,mBAAoB,WAE3CR,OAAOkB,WAAWE,YAQ9BC,gBAAkB,WACd,IAAKjE,KAAKoD,MAAS,MAAOvB,IAC1B,IAAIqC,GAAa/D,EAAOI,UAAU0D,gBAAgB9C,KAAMnB,KAIxD,OAFAkE,GAAWC,KAAM,WAAYC,UAAWF,EAAWC,KAAM,cACzDnE,KAAKqE,oBAAqBH,GACnBA,GAIXG,oBAAsB,SAAUC,GAE5B,MADAA,GAAWA,GAAYtE,KAAK0B,IACrBG,EAAG7B,KAAKuE,UAAUC,YAAcxE,OAASoE,UAAWE,EAASH,KAAM,eAI9EM,oBAAsB,SAAUH,GAC5B,GAAI/C,GAAQvB,KACR0E,EAAYnD,EAAMoD,cAAeL,GACjCM,EAAY/C,EAAG,qBAEnB,OAAMd,GAAE8D,QAAStD,EAAMuD,SAAYvD,EAAMwD,WACnCnC,QAAUA,OAAOoC,QAAUJ,EAAUK,QACvCP,EAAUQ,QAEVR,EAAUS,MACN9F,EAAI,yBAA2B,KAAMA,EAAI,YACzC,sDACIA,EAAI,sBACR,OACAA,EAAI,QAAU,sDACVA,EAAI,oCACR,QACF+F,KAAK,KACPV,EAAUP,KAAM,kBAAmBkB,MAAO,SAAUC,GAChD1C,OAAOoC,OAAOO,KAAMD,KAExBZ,EAAUP,KAAM,kBAAmBkB,MAAO,WACtCT,EAAUY,SAAS1D,UAAW,GAC9B8C,EAAUT,KAAM,6BACXkB,UAMFX,EAAUa,QAEdpF,EAAOI,UAAUkE,oBAAoBtD,KAAMnB,KAAMsE,IAI5DmB,YAAc,SAAUC,GACpB,GAAInE,GAAQvB,IAEZG,GAAOI,UAAUkF,YAAYtE,KAAMnB,KAAM0F,GACrC1F,KAAKc,YAAY4C,IAAK,oBACtB1D,KAAK2F,WAAWC,QAAQ,GAG5B5F,KAAK2F,WAAWlE,GAAI,yDAChB,SAAUkE,GACNpE,EAAMT,YAAYc,IAAK,kBAAmB+D,EAAWE,WAKjEC,kBAAoB,SAAUJ,GAC1B,GAAInE,GAAQvB,IAEZG,GAAOI,UAAUuF,kBAAkB3E,KAAMnB,KAAM0F,GAC3C1F,KAAKc,YAAY4C,IAAK,0BACtB1D,KAAK+F,iBAAiBH,QAAQ,GAGlC5F,KAAK+F,iBAAiBtE,GAAI,yDACtB,SAAUsE,GACNxE,EAAMT,YAAYc,IAAK,wBAAyBmE,EAAiBF,WAM7EG,eAAiB,SAAU9B,GACvB/D,EAAOI,UAAUyF,eAAe7E,KAAMnB,KAAMkE,EAC5C,IAAI3C,GAAQvB,IASZ,OARAe,GAAEkF,MAAO,WACL,GAAIC,GAAM3E,EAAMT,YAAY4C,IAAK,iBAC7BwC,IACA3E,EAAM4E,SAAUD,IAErB,IAGIlG,MAKXoG,aAAe,SAAU9B,GACrBnE,EAAOI,UAAU6F,aAAajF,KAAMnB,KAAMsE,EAC1C,IACI+B,GADA9E,EAAQvB,IAMZ,OAJIuB,GAAMF,mBACLgF,EAAqB9E,EAAM+E,gBAAiB/E,EAAMF,oBACnDE,EAAMgF,kBAAmBF,GAEtBrG,MAIXwG,YAAc,SAAUpD,EAAOK,EAAYgD,GACvC,GAAIC,GAAOvG,EAAOI,UAAUiG,YAAYrF,KAAMnB,KAAMoD,EAAOK,EAAYgD,EACvE,OAAKC,IACD1G,KAAKoB,WAAWuF,OAAiB3G,KAAK4G,0BADtBF,GAOxBG,wBAA0B,SAAUH,GAChC,GAAInF,GAAQvB,IAgBZ,OAfAG,GAAOI,UAAUsG,wBAAwB1F,KAAMI,EAAOmF,GAGtDA,EAAKjF,GAAI,qBAAsB,SAAUqF,EAAGC,GACxC/G,KAAKgH,sBAAuBD,IAC7B/G,MACH0G,EAAKjF,GAAI,sBAAuB,SAAUqF,EAAGC,GACzC/G,KAAK4G,wBAAyBG,IAC/B/G,MAGH0G,EAAKjF,GAAI,iDAAkD,SAAUqF,GACjE9G,KAAKuG,kBAAmBO,IACzB9G,MAEIA,MAIXuG,kBAAoB,SAAUG,GAC1B1G,KAAK6B,EAAG,oCAAqCoF,YAAa,mBACtDP,GACAA,EAAKhF,IAAIwF,SAAU,mBACnBlH,KAAKqB,iBAAmBqF,EAAKtD,MAAMpC,IAEnChB,KAAKqB,iBAAmB,MAKhC2F,sBAAwB,SAAUD,GAC9B/G,KAAKoB,WAAW+F,KAAMJ,GAEtB/G,KAAK6B,EAAG,eAAgBuF,IAAKpH,KAAKqH,SAAUC,OAC5CP,EAAUQ,WAAavH,KAAKoD,MAAMM,IAAK,QACvC1D,KAAK0B,IAAI8F,OAAQT,EAAU1D,SAAS3B,MAIxCkF,wBAA0B,WACtB5G,KAAKoB,WAAWqG,MAEhBzH,KAAKqD,UAMTqE,oBAAsB,SAAU5D,GAC5B,MAAKA,IAIL9D,KAAK+D,SAAUD,EAAY,aAAe9D,KAAK2H,kBAC/C3H,KAAK+D,SAAUD,EAAY,cAAe9D,KAAK4H,kBAG/C5H,KAAKyB,GAAI,4BAA6B,WAC9BqC,GAAcA,EAAW+D,eACzB7H,KAAK2H,qBAGN3H,MAZIA,MAiBf8H,cAAgB,SAAUxC,GACtB,GAAIyC,GAAWhH,EAAEiH,YAAa1C,GAEzBtF,KAAKiI,YAAYC,SAAU,sBAD5BrG,EAAGyD,EAAG6C,cAMV,OAJAJ,GAAUA,EAAQK,IAAK,kBACvBL,EAAQM,QAASrI,KAAKsI,QAAS,WAC3BzG,EAAG7B,MAAOuI,WAEPvI,MAKX2H,iBAAmB,WACf,GAAIa,GAAOxI,KAAK6B,EAAG,iBACf2G,GAAK7G,GAAI,YAAe6G,EAAKC,UAAWzI,KAAKsI,UAMrDV,iBAAmB,WACf,GAAIY,GAAOxI,KAAK6B,EAAG,iBACd2G,GAAK7G,GAAI,YAAe6G,EAAKE,QAAS1I,KAAKsI,UAKpDzI,SAAc,WACV,MAAO,wBAA4BG,KAAW,MAAIA,KAAKoD,MAAMM,IAAK,QAAU,IAAU,MAsB1F,OAhBJrD,GAAoBE,UAAUgE,UAAa,WAEvC,GAAIoE,GAAmBvJ,EAASwJ,cAC5B,2CACIvJ,EAAI,gCAAkC,KACtCA,EAAI,oFAAsF,IAC9F,UACD,UACH,OAAO0B,GAAEvB,OAAQuB,EAAE8H,MAAO1I,EAAOI,UAAUgE,YACvCC,SAAWmE,QAQXtI,oBAA6BA"}
\ No newline at end of file
+{"version":3,"file":"history-panel-edit-current.js","sources":["../../../src/mvc/history/history-panel-edit-current.js"],"names":["define","HISTORY_MODEL","HPANEL_EDIT","DC_PANEL","BASE_MVC","_l","HistoryPanelPrefs","SessionStorageModel","extend","defaults","tagsEditorShown","annotationEditorShown","scrollPosition","toString","JSON","stringify","this","toJSON","storageKey","_super","HistoryPanelEdit","CurrentHistoryPanel","className","prototype","emptyMsg","noneFoundMsg","HDCAViewClass","foldoutStyle","initialize","attributes","preferences","_","id","pick","keys","call","panelStack","currentContentId","_setUpListeners","panel","$scrollContainer","on","$el","is","set","$","scrollTop","loadCurrentHistory","debug","loadHistoryWithDetails","then","trigger","switchToHistory","historyId","historyFn","jQuery","getJSON","galaxy_config","root","createNewHistory","Galaxy","currUser","isAnonymous","displayMessage","when","loadHistory","undefined","setModel","model","render","log","checkForUpdates","_setUpCollectionListeners","collection","get","storage","removeItemView","_setUpModelListeners","quotaMeter","listenTo","update","_buildNewRender","$newRender","find","prependTo","_renderQuotaMessage","$whereTo","templates","quotaMsg","_renderEmptyMessage","$emptyMsg","$emptyMessage","$toolMenu","isEmpty","views","searchFor","upload","size","empty","html","join","click","ev","show","parent","_renderTags","$where","tagsEditor","toggle","hidden","_renderAnnotation","annotationEditor","_swapNewRender","delay","pos","scrollTo","_attachItems","_setCurrentContentById","addItemView","options","view","length","_collapseDrilldownPanel","_setUpItemViewListeners","v","drilldown","_expandDrilldownPanel","setCurrentContent","removeClass","addClass","viewFromModelId","push","add","$list","hide","parentName","append","pop","listenToGalaxy","galaxy","data","pathToMatch","fullpath","useToURLRegexMap","display","edit","report_error","rerun","show_params","hdaId","hdaUse","regex","use","match","connectToQuotaMeter","showQuotaMessage","hideQuotaMessage","isOverQuota","clearMessages","$target","isUndefined","$messages","children","currentTarget","not","fadeOut","fxSpeed","remove","$msg","slideDown","slideUp","quotaMsgTemplate","wrapTemplate","clone"],"mappings":"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"}
\ No newline at end of file
diff --git a/static/scripts/galaxy-app-base.js b/static/scripts/galaxy-app-base.js
index 2a936f67005..9bf049f5016 100644
--- a/static/scripts/galaxy-app-base.js
+++ b/static/scripts/galaxy-app-base.js
@@ -1,2 +1,2 @@
-define(["mvc/user/user-model","utils/metrics-logger","utils/add-logging","utils/localization","bootstrapped-data"],function(a,b,c,d,e){function f(a){var b=this;return b._init(a||{})}return c(f,"GalaxyApp"),f.prototype.defaultOptions={patchExisting:!0,root:"/"},f.prototype._init=function(a){var b=this;return _.extend(b,Backbone.Events),b._processOptions(a),b.debug("GalaxyApp.options: ",b.options),b._patchGalaxy(window.Galaxy),b._initLogger(a.loggerOptions||{}),b.debug("GalaxyApp.logger: ",b.logger),b._initLocale(),b.debug("GalaxyApp.localize: ",b.localize),b.config=a.config||e.config||{},b.debug("GalaxyApp.config: ",b.config),b._initUser(a.user||e.user||{}),b.debug("GalaxyApp.user: ",b.user),b.trigger("ready",b),b._setUpListeners(),b},f.prototype._processOptions=function(a){var b=this,c=b.defaultOptions;b.debug("_processOptions: ",a),b.options={};for(var d in c)c.hasOwnProperty(d)&&(b.options[d]=a.hasOwnProperty(d)?a[d]:c[d]);return b},f.prototype._patchGalaxy=function(a){var b=this;if(b.options.patchExisting&&a){b.debug("found existing Galaxy object:",a);for(var c in a)a.hasOwnProperty(c)&&(b.debug(" patching in "+c+" to Galaxy"),b[c]=a[c])}},f.prototype._initLogger=function(a){var c=this;return c.debug("_initLogger:",a),c.logger=new b.MetricsLogger(a),c},f.prototype._initLocale=function(a){var b=this;return b.debug("_initLocale:",a),b.localize=d,window._l=b.localize,b},f.prototype._initUser=function(b){var c=this;return c.debug("_initUser:",b),c.user=new a.User(b),c.currUser=c.user,c},f.prototype._setUpListeners=function(){var a=this;a.lastAjax={},$(document).bind("ajaxSend",function(b,c,d){var e=d.data;try{e=JSON.parse(e)}catch(f){}a.lastAjax={url:location.href.slice(0,-1)+d.url,data:e}})},f.prototype.toString=function(){var a=this.user.get("email")||"(anonymous)";return"GalaxyApp("+a+")"},{GalaxyApp:f}});
+define(["mvc/user/user-model","utils/metrics-logger","utils/add-logging","utils/localization","bootstrapped-data"],function(a,b,c,d,e){function f(a){var b=this;return b._init(a||{})}return c(f,"GalaxyApp"),f.prototype.defaultOptions={patchExisting:!0,root:"/"},f.prototype._init=function(a){var b=this;return _.extend(b,Backbone.Events),b._processOptions(a),b.debug("GalaxyApp.options: ",b.options),b._patchGalaxy(window.Galaxy),b._initLogger(a.loggerOptions||{}),b.debug("GalaxyApp.logger: ",b.logger),b._initLocale(),b.debug("GalaxyApp.localize: ",b.localize),b.config=a.config||e.config||{},b.debug("GalaxyApp.config: ",b.config),b._initUser(a.user||e.user||{}),b.debug("GalaxyApp.user: ",b.user),b.trigger("ready",b),b._setUpListeners(),b},f.prototype._processOptions=function(a){var b=this,c=b.defaultOptions;b.debug("_processOptions: ",a),b.options={};for(var d in c)c.hasOwnProperty(d)&&(b.options[d]=a.hasOwnProperty(d)?a[d]:c[d]);return b},f.prototype._patchGalaxy=function(a){var b=this;if(b.options.patchExisting&&a){b.debug("found existing Galaxy object:",a);for(var c in a)a.hasOwnProperty(c)&&(b.debug(" patching in "+c+" to Galaxy"),b[c]=a[c])}},f.prototype._initLogger=function(a){var c=this;return c.debug("_initLogger:",a),c.logger=new b.MetricsLogger(a),c},f.prototype._initLocale=function(a){var b=this;return b.debug("_initLocale:",a),b.localize=d,window._l=b.localize,b},f.prototype._initUser=function(b){var c=this;return c.debug("_initUser:",b),c.user=new a.User(b),c.currUser=c.user,c},f.prototype._setUpListeners=function(){var a=this;return a.lastAjax={},$(document).bind("ajaxSend",function(b,c,d){var e=d.data;try{e=JSON.parse(e)}catch(f){}a.lastAjax={url:location.href.slice(0,-1)+d.url,data:e}}),a._listenToGalaxyMain(),a},f.prototype._listenToGalaxyMain=function(){var a=this,b="iframe#galaxy_main",c=$(b);if(c=c.size()?c.get(0).contentWindow:void 0){var d=function(){try{var c=$(b).get(0).contentWindow,d=c.location.pathname+c.location.search+c.location.hash;a.trigger("galaxy_main:load",{fullpath:d,pathname:c.location.pathname,search:c.location.search,hash:c.location.hash})}catch(e){a.debug("Error handling main frame load:",e)}};$(b).on("load",d)}else a.debug("No galaxy_main found")},f.prototype.toString=function(){var a=this.user.get("email")||"(anonymous)";return"GalaxyApp("+a+")"},{GalaxyApp:f}});
//# sourceMappingURL=../maps/galaxy-app-base.js.map
\ No newline at end of file
diff --git a/static/scripts/mvc/history/history-panel-edit-current.js b/static/scripts/mvc/history/history-panel-edit-current.js
index 8ec0e50e112..5bae59108ea 100644
--- a/static/scripts/mvc/history/history-panel-edit-current.js
+++ b/static/scripts/mvc/history/history-panel-edit-current.js
@@ -1,2 +1,2 @@
-define(["mvc/history/history-model","mvc/history/history-panel-edit","mvc/collection/collection-panel","mvc/base-mvc","utils/localization"],function(a,b,c,d,e){var f=d.SessionStorageModel.extend({defaults:{tagsEditorShown:!1,annotationEditorShown:!1,scrollPosition:0},toString:function(){return"HistoryPanelPrefs("+JSON.stringify(this.toJSON())+")"}});f.storageKey=function(){return"history-panel"};var g=b.HistoryPanelEdit,h=g.extend({className:g.prototype.className+" current-history-panel",emptyMsg:e("This history is empty. Click 'Get Data' on the left tool menu to start"),noneFoundMsg:e("No matching datasets found"),HDCAViewClass:g.prototype.HDCAViewClass.extend({foldoutStyle:"drilldown"}),initialize:function(a){a=a||{},this.preferences=new f(_.extend({id:f.storageKey()},_.pick(a,_.keys(f.prototype.defaults)))),g.prototype.initialize.call(this,a),this.panelStack=[],this.currentContentId=a.currentContentId||null},_setUpListeners:function(){g.prototype._setUpListeners.call(this);var a=this;this.$scrollContainer().on("scroll",function(){a.$el.is(":visible")&&a.preferences.set("scrollPosition",$(this).scrollTop())}),this.on("new-model",function(){a.preferences.set("scrollPosition",0)})},loadCurrentHistory:function(a){this.debug(this+".loadCurrentHistory");var b=this;return this.loadHistoryWithDetails("current",a).then(function(){b.trigger("current-history",b)})},switchToHistory:function(a,b){var c=this,d=function(){return jQuery.getJSON(galaxy_config.root+"history/set_as_current?id="+a)};return this.loadHistoryWithDetails(a,b,d).then(function(){c.trigger("switched-history",c)})},createNewHistory:function(a){if(!Galaxy||!Galaxy.currUser||Galaxy.currUser.isAnonymous())return this.displayMessage("error",e("You must be logged in to create histories")),$.when();var b=this,c=function(){return jQuery.getJSON(galaxy_config.root+"history/create_new_current")};return this.loadHistory(void 0,a,c).then(function(){b.trigger("new-history",b)})},setModel:function(a,b,c){return g.prototype.setModel.call(this,a,b,c),this.model&&(this.log("checking for updates"),this.model.checkForUpdates()),this},_setUpCollectionListeners:function(){g.prototype._setUpCollectionListeners.call(this),this.collection.on("state:ready",function(a){a.get("visible")||this.storage.get("show_hidden")||this.removeItemView(a)},this)},_setUpModelListeners:function(){g.prototype._setUpModelListeners.call(this),Galaxy&&Galaxy.quotaMeter&&this.listenTo(this.model,"change:nice_size",function(){Galaxy.quotaMeter.update()})},_buildNewRender:function(){if(!this.model)return $();var a=g.prototype._buildNewRender.call(this);return a.find(".search").prependTo(a.find(".controls")),this._renderQuotaMessage(a),a},_renderQuotaMessage:function(a){return a=a||this.$el,$(this.templates.quotaMsg({},this)).prependTo(a.find(".messages"))},_renderEmptyMessage:function(a){var b=this,c=b.$emptyMessage(a),d=$(".toolMenuContainer");return _.isEmpty(b.views)&&!b.searchFor&&Galaxy&&Galaxy.upload&&d.size()?(c.empty(),c.html([e("This history is empty"),". ",e("You can "),'',e("load your own data"),"",e(" or "),'',e("get data from an external source"),""].join("")),c.find(".uploader-link").click(function(a){Galaxy.upload.show(a)}),c.find(".get-data-link").click(function(){d.parent().scrollTop(0),d.find('span:contains("Get Data")').click()}),c.show()):g.prototype._renderEmptyMessage.call(this,a)},_renderTags:function(a){var b=this;g.prototype._renderTags.call(this,a),this.preferences.get("tagsEditorShown")&&this.tagsEditor.toggle(!0),this.tagsEditor.on("hiddenUntilActivated:shown hiddenUntilActivated:hidden",function(a){b.preferences.set("tagsEditorShown",a.hidden)})},_renderAnnotation:function(a){var b=this;g.prototype._renderAnnotation.call(this,a),this.preferences.get("annotationEditorShown")&&this.annotationEditor.toggle(!0),this.annotationEditor.on("hiddenUntilActivated:shown hiddenUntilActivated:hidden",function(a){b.preferences.set("annotationEditorShown",a.hidden)})},_swapNewRender:function(a){g.prototype._swapNewRender.call(this,a);var b=this;return _.delay(function(){var a=b.preferences.get("scrollPosition");a&&b.scrollTo(a)},10),this},_attachItems:function(a){g.prototype._attachItems.call(this,a);var b,c=this;return c.currentContentId&&(b=c.viewFromModelId(c.currentContentId))&&c.setCurrentContent(b),this},addItemView:function(a,b,c){var d=g.prototype.addItemView.call(this,a,b,c);return d&&this.panelStack.length?this._collapseDrilldownPanel():d},_setUpItemViewListeners:function(a){var b=this;return g.prototype._setUpItemViewListeners.call(b,a),a.on("expanded:drilldown",function(a,b){this._expandDrilldownPanel(b)},this),a.on("collapsed:drilldown",function(a,b){this._collapseDrilldownPanel(b)},this),a.on("display edit params rerun report-err visualize",function(a){this.setCurrentContent(a)},this),this},setCurrentContent:function(a){this.$(".history-content.current-content").removeClass("current-content"),a?(a.$el.addClass("current-content"),this.currentContentId=a.model.id):this.currentContentId=null},_expandDrilldownPanel:function(a){this.panelStack.push(a),this.$("> .controls").add(this.$list()).hide(),a.parentName=this.model.get("name"),this.$el.append(a.render().$el)},_collapseDrilldownPanel:function(){this.panelStack.pop(),this.render()},connectToQuotaMeter:function(a){return a?(this.listenTo(a,"quota:over",this.showQuotaMessage),this.listenTo(a,"quota:under",this.hideQuotaMessage),this.on("rendered rendered:initial",function(){a&&a.isOverQuota()&&this.showQuotaMessage()}),this):this},clearMessages:function(a){var b=_.isUndefined(a)?this.$messages().children('[class$="message"]'):$(a.currentTarget);return b=b.not(".quota-message"),b.fadeOut(this.fxSpeed,function(){$(this).remove()}),this},showQuotaMessage:function(){var a=this.$(".quota-message");a.is(":hidden")&&a.slideDown(this.fxSpeed)},hideQuotaMessage:function(){var a=this.$(".quota-message");a.is(":hidden")||a.slideUp(this.fxSpeed)},toString:function(){return"CurrentHistoryPanel("+(this.model?this.model.get("name"):"")+")"}});return h.prototype.templates=function(){var a=d.wrapTemplate(['',e("You are over your disk quota"),". ",e("Tool execution is on hold until your disk usage drops below your allocated quota"),".","
"],"history");return _.extend(_.clone(g.prototype.templates),{quotaMsg:a})}(),{CurrentHistoryPanel:h}});
+define(["mvc/history/history-model","mvc/history/history-panel-edit","mvc/collection/collection-panel","mvc/base-mvc","utils/localization"],function(a,b,c,d,e){var f=d.SessionStorageModel.extend({defaults:{tagsEditorShown:!1,annotationEditorShown:!1,scrollPosition:0},toString:function(){return"HistoryPanelPrefs("+JSON.stringify(this.toJSON())+")"}});f.storageKey=function(){return"history-panel"};var g=b.HistoryPanelEdit,h=g.extend({className:g.prototype.className+" current-history-panel",emptyMsg:e("This history is empty. Click 'Get Data' on the left tool menu to start"),noneFoundMsg:e("No matching datasets found"),HDCAViewClass:g.prototype.HDCAViewClass.extend({foldoutStyle:"drilldown"}),initialize:function(a){a=a||{},this.preferences=new f(_.extend({id:f.storageKey()},_.pick(a,_.keys(f.prototype.defaults)))),g.prototype.initialize.call(this,a),this.panelStack=[],this.currentContentId=a.currentContentId||null},_setUpListeners:function(){g.prototype._setUpListeners.call(this);var a=this;this.$scrollContainer().on("scroll",function(){a.$el.is(":visible")&&a.preferences.set("scrollPosition",$(this).scrollTop())}),this.on("new-model",function(){a.preferences.set("scrollPosition",0)})},loadCurrentHistory:function(a){this.debug(this+".loadCurrentHistory");var b=this;return this.loadHistoryWithDetails("current",a).then(function(){b.trigger("current-history",b)})},switchToHistory:function(a,b){var c=this,d=function(){return jQuery.getJSON(galaxy_config.root+"history/set_as_current?id="+a)};return this.loadHistoryWithDetails(a,b,d).then(function(){c.trigger("switched-history",c)})},createNewHistory:function(a){if(!Galaxy||!Galaxy.currUser||Galaxy.currUser.isAnonymous())return this.displayMessage("error",e("You must be logged in to create histories")),$.when();var b=this,c=function(){return jQuery.getJSON(galaxy_config.root+"history/create_new_current")};return this.loadHistory(void 0,a,c).then(function(){b.trigger("new-history",b)})},setModel:function(a,b,c){return g.prototype.setModel.call(this,a,b,c),this.model&&(this.log("checking for updates"),this.model.checkForUpdates()),this},_setUpCollectionListeners:function(){g.prototype._setUpCollectionListeners.call(this),this.collection.on("state:ready",function(a){a.get("visible")||this.storage.get("show_hidden")||this.removeItemView(a)},this)},_setUpModelListeners:function(){g.prototype._setUpModelListeners.call(this),Galaxy&&Galaxy.quotaMeter&&this.listenTo(this.model,"change:nice_size",function(){Galaxy.quotaMeter.update()})},_buildNewRender:function(){if(!this.model)return $();var a=g.prototype._buildNewRender.call(this);return a.find(".search").prependTo(a.find(".controls")),this._renderQuotaMessage(a),a},_renderQuotaMessage:function(a){return a=a||this.$el,$(this.templates.quotaMsg({},this)).prependTo(a.find(".messages"))},_renderEmptyMessage:function(a){var b=this,c=b.$emptyMessage(a),d=$(".toolMenuContainer");return _.isEmpty(b.views)&&!b.searchFor&&Galaxy&&Galaxy.upload&&d.size()?(c.empty(),c.html([e("This history is empty"),". ",e("You can "),'',e("load your own data"),"",e(" or "),'',e("get data from an external source"),""].join("")),c.find(".uploader-link").click(function(a){Galaxy.upload.show(a)}),c.find(".get-data-link").click(function(){d.parent().scrollTop(0),d.find('span:contains("Get Data")').click()}),c.show()):g.prototype._renderEmptyMessage.call(this,a)},_renderTags:function(a){var b=this;g.prototype._renderTags.call(this,a),this.preferences.get("tagsEditorShown")&&this.tagsEditor.toggle(!0),this.tagsEditor.on("hiddenUntilActivated:shown hiddenUntilActivated:hidden",function(a){b.preferences.set("tagsEditorShown",a.hidden)})},_renderAnnotation:function(a){var b=this;g.prototype._renderAnnotation.call(this,a),this.preferences.get("annotationEditorShown")&&this.annotationEditor.toggle(!0),this.annotationEditor.on("hiddenUntilActivated:shown hiddenUntilActivated:hidden",function(a){b.preferences.set("annotationEditorShown",a.hidden)})},_swapNewRender:function(a){g.prototype._swapNewRender.call(this,a);var b=this;return _.delay(function(){var a=b.preferences.get("scrollPosition");a&&b.scrollTo(a)},10),this},_attachItems:function(a){g.prototype._attachItems.call(this,a);var b=this;return b.currentContentId&&b._setCurrentContentById(b.currentContentId),this},addItemView:function(a,b,c){var d=g.prototype.addItemView.call(this,a,b,c);return d&&this.panelStack.length?this._collapseDrilldownPanel():d},_setUpItemViewListeners:function(a){var b=this;return g.prototype._setUpItemViewListeners.call(b,a),a.on("expanded:drilldown",function(a,b){this._expandDrilldownPanel(b)},this),a.on("collapsed:drilldown",function(a,b){this._collapseDrilldownPanel(b)},this),this},setCurrentContent:function(a){this.$(".history-content.current-content").removeClass("current-content"),a?(a.$el.addClass("current-content"),this.currentContentId=a.model.id):this.currentContentId=null},_setCurrentContentById:function(a){var b=this.viewFromModelId(a)||null;this.setCurrentContent(b)},_expandDrilldownPanel:function(a){this.panelStack.push(a),this.$("> .controls").add(this.$list()).hide(),a.parentName=this.model.get("name"),this.$el.append(a.render().$el)},_collapseDrilldownPanel:function(){this.panelStack.pop(),this.render()},listenToGalaxy:function(a){a.on("galaxy_main:load",function(a){var b=a.fullpath,c={display:/datasets\/([a-f0-9]+)\/display/,edit:/datasets\/([a-f0-9]+)\/edit/,report_error:/dataset\/errors\?id=([a-f0-9]+)/,rerun:/tool_runner\/rerun\?id=([a-f0-9]+)/,show_params:/datasets\/([a-f0-9]+)\/show_params/},d=null,e=null;_.find(c,function(a,c){var f=b.match(a);return f&&2==f.length?(d=f[1],e=c,!0):!1}),d="dataset-"+d,this._setCurrentContentById(d)},this)},connectToQuotaMeter:function(a){return a?(this.listenTo(a,"quota:over",this.showQuotaMessage),this.listenTo(a,"quota:under",this.hideQuotaMessage),this.on("rendered rendered:initial",function(){a&&a.isOverQuota()&&this.showQuotaMessage()}),this):this},clearMessages:function(a){var b=_.isUndefined(a)?this.$messages().children('[class$="message"]'):$(a.currentTarget);return b=b.not(".quota-message"),b.fadeOut(this.fxSpeed,function(){$(this).remove()}),this},showQuotaMessage:function(){var a=this.$(".quota-message");a.is(":hidden")&&a.slideDown(this.fxSpeed)},hideQuotaMessage:function(){var a=this.$(".quota-message");a.is(":hidden")||a.slideUp(this.fxSpeed)},toString:function(){return"CurrentHistoryPanel("+(this.model?this.model.get("name"):"")+")"}});return h.prototype.templates=function(){var a=d.wrapTemplate(['',e("You are over your disk quota"),". ",e("Tool execution is on hold until your disk usage drops below your allocated quota"),".","
"],"history");return _.extend(_.clone(g.prototype.templates),{quotaMsg:a})}(),{CurrentHistoryPanel:h}});
//# sourceMappingURL=../../../maps/mvc/history/history-panel-edit-current.js.map
\ No newline at end of file
diff --git a/templates/webapps/galaxy/root/index.mako b/templates/webapps/galaxy/root/index.mako
index d4514e7c125..86e8570161f 100644
--- a/templates/webapps/galaxy/root/index.mako
+++ b/templates/webapps/galaxy/root/index.mako
@@ -27,7 +27,7 @@
var galaxy_async = new GalaxyAsync();
galaxy_async.set_func_url( galaxy_async.set_user_pref,
"${h.url_for( controller='user', action='set_user_pref_async' )}");
-
+
$(function(){
// Fix iFrame scrolling on iOS
if( navigator.userAgent.match( /(iPhone|iPod|iPad)/i ) ) {
@@ -82,7 +82,7 @@
else:
center_url = h.url_for( controller="root", action="welcome" )
%>
-
+
@@ -150,6 +150,7 @@
$scrollContainer: function(){ return this.$el.parent(); }
});
currPanel.connectToQuotaMeter( Galaxy.quotaMeter );
+ currPanel.listenToGalaxy( Galaxy );
currPanel.loadCurrentHistory();
Galaxy.currHistoryPanel = currPanel;
});