Skip to content

Commit ac1585b

Browse files
authored
Fix browser back button (#17627)
Fix browser back button
2 parents 908f13e + 87c2ab3 commit ac1585b

File tree

7 files changed

+275
-247
lines changed

7 files changed

+275
-247
lines changed

core/js/dist/login.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/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: 255 additions & 234 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: 4 additions & 4 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: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,11 @@ import { registerAppsSlideToggle } from './OC/apps'
3535
$(document).ready(function() {
3636
initCore()
3737
registerAppsSlideToggle()
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+
}
3845
})

0 commit comments

Comments
 (0)