clipperz/password-manager-mirror
1
0
Fork 0
mirror of http://git.whoc.org.uk/git/password-manager.git synced 2024-11-14 23:49:02 +01:00
Code Issues Releases Wiki Activity

Tentative fix for offline copy problem

Browse Source
This commit is contained in:
Giulio Cesare Solaroli 2015-12-07 10:56:27 +01:00
parent 31fc8ede9e
commit d0eabc16f6
1 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
frontend/delta/js/Clipperz/PM/UI/MainController.js
View File

@ -1044,9 +1044,31 @@ Clipperz.log("THE BROWSER IS OFFLINE");
//========================================================================= //=========================================================================
historyReplaceState: function (args) {
if (window.document.origin != null) {
window.history.replaceState.apply(window.history, arguments);
}
},
historyPushState: function (args) {
if (window.document.origin != null) {
window.history.pushState.apply(window.history, arguments);
}
},
historyState: function (args) {
if (window.document.origin != null) {
return window.history.state.apply(window.history, arguments);
}
},
//=========================================================================
runApplication: function (anUser) { runApplication: function (anUser) {
window.history.replaceState({selectedCardInfo: null}, "", window.location.toString()); // window.history.replaceState({selectedCardInfo: null}, "", window.location.toString());
window.history.pushState({selectedCardInfo: null}, "", window.location.toString()); // Hack to support filters undo with no other actions this.historyReplaceState({selectedCardInfo: null}, "", window.location.toString());
// window.history.pushState({selectedCardInfo: null}, "", window.location.toString()); // Hack to support filters undo with no other actions
this.historyPushState({selectedCardInfo: null}, "", window.location.toString()); // Hack to support filters undo with no other actions
this.moveInPage(this.currentPage(), 'mainPage'); this.moveInPage(this.currentPage(), 'mainPage');
MochiKit.Signal.signal(Clipperz.Signal.NotificationCenter, 'enableLock'); MochiKit.Signal.signal(Clipperz.Signal.NotificationCenter, 'enableLock');
this.resetLockTimeout(); this.resetLockTimeout();
@ -1170,11 +1192,11 @@ Clipperz.log("THE BROWSER IS OFFLINE");
this.moveOutPage(fromPage, toPage); this.moveOutPage(fromPage, toPage);
}, },
historyGoBack: function (anEvent) { // historyGoBack: function (anEvent) {
anEvent.preventDefault(); // anEvent.preventDefault();
anEvent.stopPropagation(); // anEvent.stopPropagation();
this.goBack(); // this.goBack();
}, // },
currentPage: function () { currentPage: function () {
return this.pageStack()[0]; return this.pageStack()[0];
@ -1596,7 +1618,8 @@ Clipperz.log("THE BROWSER IS OFFLINE");
selectCard_handler: function (someInfo, shouldUpdateCardDetail) { selectCard_handler: function (someInfo, shouldUpdateCardDetail) {
this.selectCard(someInfo, shouldUpdateCardDetail); this.selectCard(someInfo, shouldUpdateCardDetail);
window.history.pushState({selectedCardInfo: someInfo}, "", window.location.toString()); // window.history.pushState({selectedCardInfo: someInfo}, "", window.location.toString());
this.historyPushState({selectedCardInfo: someInfo}, "", window.location.toString());
// console.log("pushing state"); // console.log("pushing state");
}, },
@ -2014,7 +2037,8 @@ Clipperz.log("THE BROWSER IS OFFLINE");
goBackToMainPage_handler: function (anEvent) { goBackToMainPage_handler: function (anEvent) {
this.goBackToMainPage(anEvent); this.goBackToMainPage(anEvent);
window.history.pushState({selectedCardInfo: null}, "", window.location.toString()); // window.history.pushState({selectedCardInfo: null}, "", window.location.toString());
this.historyPushState({selectedCardInfo: null}, "", window.location.toString());
}, },
//============================================================================ //============================================================================
@ -2353,10 +2377,12 @@ Clipperz.log("THE BROWSER IS OFFLINE");
handleOnpopstate: function (anEvent) { handleOnpopstate: function (anEvent) {
if (this.filter().type != 'ALL') { if (this.filter().type != 'ALL') {
this.selectAllCards(); this.selectAllCards();
window.history.pushState(window.history.state, "", window.location.toString()); // window.history.pushState(window.history.state, "", window.location.toString());
this.historyPushState(this.historyState, "", window.location.toString());
} else if(anEvent.state) { } else if(anEvent.state) {
if (this.isPageInEditMode()) { if (this.isPageInEditMode()) {
window.history.pushState({selectedCardInfo: this.selectedCardInfo()}, "", window.location.toString()); // window.history.pushState({selectedCardInfo: this.selectedCardInfo()}, "", window.location.toString());
this.historyPushState({selectedCardInfo: this.selectedCardInfo()}, "", window.location.toString());
this.cancelCardEdits(this.selectedCardReference()); this.cancelCardEdits(this.selectedCardReference());
} else { } else {
if (anEvent.state['selectedCardInfo']) { if (anEvent.state['selectedCardInfo']) {