1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/98eff59e4510/ Changeset: 98eff59e4510 User: carlfeberhard Date: 2013-12-10 16:00:22 Summary: Masthead: move Galaxy.currUser out of ready function (bootstrap) Affected #: 1 file diff -r 4fbe7028d3a9104d0ad313cadb766ec64c877295 -r 98eff59e4510c3a3137de7e5df38120bcda9be7f templates/webapps/galaxy/galaxy.masthead.mako --- a/templates/webapps/galaxy/galaxy.masthead.mako +++ b/templates/webapps/galaxy/galaxy.masthead.mako @@ -68,6 +68,11 @@ ## load the frame manager <script type="text/javascript"> + if( !window.Galaxy ){ + window.Galaxy = {}; + } + ## fetch the current user data from trans + Galaxy.currUser = new User(${ h.to_json_string( get_user_json(), indent=2 ) }); ## load additional style sheet if (window != window.top) @@ -85,9 +90,6 @@ ## get configuration var masthead_config = ${ h.to_json_string( masthead_config ) }; - ## set up the quota meter (And fetch the current user data from trans) - Galaxy.currUser = new User(masthead_config.user.json); - ## load global galaxy objects Galaxy.masthead = new mod_masthead.GalaxyMasthead(masthead_config); Galaxy.modal = new mod_modal.GalaxyModal(); @@ -102,6 +104,7 @@ ## add upload plugin ##Galaxy.upload = new mod_upload.GalaxyUpload(masthead_config); + ## set up the quota meter (And fetch the current user data from trans) ## add quota meter to masthead Galaxy.quotaMeter = new UserQuotaMeter({ model : Galaxy.currUser, Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.