Skip to content

Commit 4789b41

Browse files
committed
Fix browser back button
Fixes #17108 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
1 parent 348a7bb commit 4789b41

9 files changed

Lines changed: 301 additions & 272 deletions

File tree

core/js/dist/login.js

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/js/dist/login.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/js/dist/main.js

Lines changed: 274 additions & 252 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/js/dist/main.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/js/dist/maintenance.js

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/js/dist/maintenance.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/src/main.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,11 @@ $(document).ready(function () {
3535
initCore();
3636

3737
registerAppsSlideToggle();
38-
});
38+
39+
// fallback to hashchange when no history support
40+
if (window.history.pushState) {
41+
window.onpopstate = _.bind(OC.Util.History._onPopState, OC.Util.History);
42+
} else {
43+
$(window).on('hashchange', _.bind(OC.Util.History._onPopState, OC.Util.History));
44+
}
45+
})

settings/js/vue-5.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

settings/js/vue-5.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)