From fa03332fe6dd8cc9a2e438da04876eb237a8ef08 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Mon, 22 Aug 2011 15:57:43 +0200 Subject: [PATCH] fix history bug --- .../sonia.repository.changesetviewerpanel.js | 7 +++++- .../main/webapp/resources/js/sonia.history.js | 25 +++++++++++++++---- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.changesetviewerpanel.js b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.changesetviewerpanel.js index 24f13d7846..a9eed638fe 100644 --- a/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.changesetviewerpanel.js +++ b/scm-webapp/src/main/webapp/resources/js/repository/sonia.repository.changesetviewerpanel.js @@ -41,7 +41,12 @@ Sonia.repository.ChangesetViewerPanel = Ext.extend(Ext.Panel, { changesetViewerTitleText: 'Commits {0}', initComponent: function(){ - this.historyId = 'changesetviewer|' + this.repository.id; + this.historyId = Sonia.History.createToken([ + 'changesetviewer', + this.repository.id, + this.start, + this.pageSize + ]); this.changesetStore = new Sonia.rest.JsonStore({ id: 'changesetStore', diff --git a/scm-webapp/src/main/webapp/resources/js/sonia.history.js b/scm-webapp/src/main/webapp/resources/js/sonia.history.js index a715368e5a..c3d5a5af26 100644 --- a/scm-webapp/src/main/webapp/resources/js/sonia.history.js +++ b/scm-webapp/src/main/webapp/resources/js/sonia.history.js @@ -38,13 +38,28 @@ Sonia.History = { recentlyChanged: [], add: function(token){ - if ( debug ){ - console.debug('add history element ' + token); + if (token != Ext.History.getToken()){ + if (this.isInvokeable(this.recentlyChanged, token)){ + if ( debug ){ + console.debug('add history element ' + token); + } + this.recentlyAdded.push(token); + Ext.History.add(token, true); + } } - if (this.isInvokeable(this.recentlyChanged, token)){ - this.recentlyAdded.push(token); - Ext.History.add(token, true); + }, + + createToken: function(elements){ + var token = ''; + if (Ext.isArray(elements)){ + for (var i=0; i