fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab2.rz.ifi.lmu.de:uni2work/uni2work

Browse Source
This commit is contained in:
Gregor Kleen 2021-06-10 21:09:25 +02:00
commit be957c73ff
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/src/lib/storage-manager/storage-manager.js
View File

@ -359,6 +359,11 @@ export class StorageManager {
addHistoryListener(listener, options=this._options, ...args) {
const modified_listener = (function(event, ...listener_args) { // eslint-disable-line no-unused-vars
// do not propagate popstate events with empty state
if(event.state === null)
return;
this._global.setTimeout(() => listener(this._getFromHistory(options), ...listener_args));
}).bind(this);
@ -473,9 +478,9 @@ export class StorageManager {
}
_debugLog() {}
// _debugLog(fName, ...args) {
// console.log(`[DEBUGLOG] StorageManager.${fName}`, { args: args, instance: this });
// }
//_debugLog(fName, ...args) {
// console.log(`[DEBUGLOG] StorageManager.${fName}`, { args: args, instance: this });
//}
}

2
frontend/src/utils/async-table/async-table.js
View File

@ -125,7 +125,7 @@ export class AsyncTable {
const historyUrl = historyState ? historyState['currentTableUrl'] : this._historyStorage.load('currentTableUrl');
this._debugLog('_historyListener', historyState, windowUrl, historyUrl);
if (this._isEquivalentUrl(windowUrl, historyUrl))
if (this._isEquivalentUrl(windowUrl, historyUrl || document.location.href))
return;
this._debugLog('_historyListener', historyUrl);