2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/b0869cdb78e3/ Changeset: b0869cdb78e3 User: carlfeberhard Date: 2013-12-13 17:02:40 Summary: HiddenUntilActivated: fix state detection when element rendered hidden Affected #: 3 files diff -r 5648e6d15803412cf9467bafd89bfb20d7a5281a -r b0869cdb78e3c8ab9a02ae9b7589960913d91cb3 static/scripts/mvc/base-mvc.js --- a/static/scripts/mvc/base-mvc.js +++ b/static/scripts/mvc/base-mvc.js @@ -204,7 +204,9 @@ /** */ toggle : function(){ // can be called manually as well with normal toggle arguments - if( this.isHidden() ){ + //TODO: better as a callback (when the show/hide is actually done) + // show + if( this.hidden ){ // fire the optional fns on the first/each showing - good for render() if( !this.HUAVOptions.hasBeenShown ){ if( _.isFunction( this.HUAVOptions.onshowFirstTime ) ){ @@ -214,17 +216,18 @@ } if( _.isFunction( this.HUAVOptions.onshow ) ){ this.HUAVOptions.onshow.call( this ); + this.trigger( 'hiddenUntilActivated:shown', this ); } this.hidden = false; + // hide } else { if( _.isFunction( this.HUAVOptions.onhide ) ){ this.HUAVOptions.onhide.call( this ); + this.trigger( 'hiddenUntilActivated:hidden', this ); } this.hidden = true; } - //TODO: better as a callback (when the show/hide is actually done) - this.trigger( 'hiddenUntilActivated:' + (( this.isHidden() )?( 'shown' ):( 'hidden' )), this ); return this.HUAVOptions.showFn.apply( this.HUAVOptions.$elementShown, arguments ); } }; diff -r 5648e6d15803412cf9467bafd89bfb20d7a5281a -r b0869cdb78e3c8ab9a02ae9b7589960913d91cb3 static/scripts/mvc/history/history-panel.js --- a/static/scripts/mvc/history/history-panel.js +++ b/static/scripts/mvc/history/history-panel.js @@ -899,7 +899,7 @@ }, /** toggle the visibility of each hdaView's tagsEditor applying all the args sent to this function */ - toggleHDATagEditors : function(){ + toggleHDATagEditors : function( showOrHide ){ var args = arguments; _.each( this.hdaViews, function( hdaView ){ if( hdaView.tagsEditor ){ diff -r 5648e6d15803412cf9467bafd89bfb20d7a5281a -r b0869cdb78e3c8ab9a02ae9b7589960913d91cb3 templates/webapps/galaxy/history/history_panel.mako --- a/templates/webapps/galaxy/history/history_panel.mako +++ b/templates/webapps/galaxy/history/history_panel.mako @@ -89,7 +89,6 @@ ## ----------------------------------------------------------------------------- generic 'base' function <%def name="history_panel_javascripts()"> -<% print 'history_panel_javascripts' %> ${h.js( "utils/localization", "mvc/base-mvc", https://bitbucket.org/galaxy/galaxy-central/commits/f92fe13caa59/ Changeset: f92fe13caa59 User: carlfeberhard Date: 2013-12-13 17:04:09 Summary: Merge Affected #: 1 file diff -r b0869cdb78e3c8ab9a02ae9b7589960913d91cb3 -r f92fe13caa5934d45397442dff658fc3c26cdf59 templates/admin/tool_shed_repository/deactivate_or_uninstall_repository.mako --- a/templates/admin/tool_shed_repository/deactivate_or_uninstall_repository.mako +++ b/templates/admin/tool_shed_repository/deactivate_or_uninstall_repository.mako @@ -89,7 +89,7 @@ <ul> %for installed_dependent_repository_tup in installed_dependent_repositories: <% - tool_shed, name, owner, installed_changeset_revision, status = installed_dependent_repository_tup + tool_shed, name, owner, installed_changeset_revision = installed_dependent_repository_tup %><li>Revision <b>${ installed_changeset_revision | h}</b> of repository <b>${name | h}</b> owned by <b>${owner | h}</b></li> %endfor @@ -100,7 +100,7 @@ <ul> %for td_tup in installed_runtime_dependent_tool_dependencies: <% - tool_shed_repository_id, name, version, type, status = td_tup + tool_shed_repository_id, name, version, type = td_tup containing_repository = irm.get_containing_repository_for_tool_dependency( td_tup ) repository_name = containing_repository.name changeset_revision = containing_repository.changeset_revision 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.