diff --git a/static/js/URL.js b/static/js/URL.js index 372d38874..4ba7107ee 100644 --- a/static/js/URL.js +++ b/static/js/URL.js @@ -446,7 +446,7 @@ pandora.URL = (function() { title = pandora.getPageTitle(stateOrURL) || pandora.getDocumentTitle(), url; - pandora.expandURL = expandURL; + pandora.replaceURL = expandURL; if (Ox.isObject(stateOrURL)) { state = stateOrURL; } else { @@ -486,7 +486,7 @@ pandora.URL = (function() { } else { if ( !pandora.$ui.appPanel - || pandora.expandURL + || pandora.replaceURL || keys.every(function(key) { return [ 'listColumnWidth', 'listColumns', 'listSelection', @@ -505,7 +505,7 @@ pandora.URL = (function() { state, pandora.getPageTitle(state) || pandora.getDocumentTitle() ); - pandora.expandURL = false; + pandora.replaceURL = false; } }; diff --git a/static/js/utils.js b/static/js/utils.js index 0d61a7abc..aef559b1b 100644 --- a/static/js/utils.js +++ b/static/js/utils.js @@ -1723,6 +1723,9 @@ pandora.renameList = function(oldId, newId, newName, folder) { pandora.$ui.folderList[folder].value(oldId, 'id', newId); if (pandora.user.ui.section == 'items') { pandora.$ui.toolbar.updateListName(newId); + // fixme: ugly + // ... does this always coincide with triggerEvents = false, as below? + pandora.replaceURL = true; pandora.UI.set({ find: { conditions: [{key: 'list', value: newId, operator: '=='}], @@ -1730,6 +1733,7 @@ pandora.renameList = function(oldId, newId, newName, folder) { } }, false); } else { + pandora.replaceURL = true; pandora.UI.set(pandora.user.ui.section.slice(0, -1), newId); } };