From: Elliot Smith Date: Mon, 5 Oct 2015 11:08:31 +0000 (+0100) Subject: toaster: Don't add new history entries when table data loads X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=70c5e40a0f77ae4835fb95275621c345f8190240;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git toaster: Don't add new history entries when table data loads When ToasterTable data is loaded into the UI, a new entry is added to the browser history. This means that pressing the back button appears to have no effect, as you end up at the same page, possibly with slightly different data. Instead, use replaceState(), so that the browser history doesn't grow, but the page context still gets updated. [YOCTO #7660] Signed-off-by: Elliot Smith Signed-off-by: Michael Wood Signed-off-by: Richard Purdie --- diff --git a/lib/toaster/toastergui/static/js/table.js b/lib/toaster/toastergui/static/js/table.js index f18034df524..bc81e67a6a6 100644 --- a/lib/toaster/toastergui/static/js/table.js +++ b/lib/toaster/toastergui/static/js/table.js @@ -33,14 +33,6 @@ function tableInit(ctx){ loadData(tableParams); - window.onpopstate = function(event){ - if (event.state){ - tableParams = event.state.tableParams; - /* We skip loadData and just update the table */ - updateTable(event.state.tableData); - } - }; - function loadData(tableParams){ $.ajax({ type: "GET", @@ -49,10 +41,8 @@ function tableInit(ctx){ headers: { 'X-CSRFToken' : $.cookie('csrftoken')}, success: function(tableData) { updateTable(tableData); - window.history.pushState({ - tableData: tableData, - tableParams: tableParams - }, null, libtoaster.dumpsUrlParams(tableParams)); + window.history.replaceState(null, null, + libtoaster.dumpsUrlParams(tableParams)); } }); }