github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-25 17:57:04 +08:00
Code Issues Actions 46 Packages Projects Releases Wiki Activity

forum: fix setting history state multiple times when scrolling in DiscussionPage

Browse Source
This commit is contained in:
David Sevilla Martin 2020-03-19 11:33:14 -04:00
parent c819a8d520
commit cfc0000df0
No known key found for this signature in database
GPG Key ID: F764F1417E16B15F
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/dist/forum.js vendored
View File

@ -19075,12 +19075,14 @@ var DiscussionPage = /*#__PURE__*/function (_Page) {
;
_proto.positionChanged = function positionChanged(startNumber, endNumber) {
var discussion = this.discussion; // Construct a URL to this discussion with the updated position, then
var discussion = this.discussion;
if (!discussion) return; // Construct a URL to this discussion with the updated position, then
// replace it into the window's history and our own history stack.
var url = app.route.discussion(discussion, this.near = startNumber);
m.route.set(url, true);
window.history.replaceState(null, document.title, url);
m.route.set(url, true, {
replace: true
});
app.history.push('discussion', discussion.title()); // If the user hasn't read past here before, then we'll update their read
// state and redraw.
@ -19703,7 +19705,7 @@ var IndexPage = /*#__PURE__*/function (_Page) {
_proto.actionItems = function actionItems() {
var items = new _common_utils_ItemList__WEBPACK_IMPORTED_MODULE_3__["default"]();
items.add('refresh', _common_components_Button__WEBPACK_IMPORTED_MODULE_4__["default"].component({
title: app.translator.trans('core.forum.index.refresh_tooltip'),
title: app.translator.transText('core.forum.index.refresh_tooltip'),
icon: 'fas fa-sync',
className: 'Button Button--icon',
onclick: function onclick() {
@ -19718,7 +19720,7 @@ var IndexPage = /*#__PURE__*/function (_Page) {
if (app.session.user) {
items.add('markAllAsRead', _common_components_Button__WEBPACK_IMPORTED_MODULE_4__["default"].component({
title: app.translator.trans('core.forum.index.mark_all_as_read_tooltip'),
title: app.translator.transText('core.forum.index.mark_all_as_read_tooltip'),
icon: 'fas fa-check',
className: 'Button Button--icon',
onclick: this.markAllAsRead.bind(this)
@ -24005,7 +24007,7 @@ __webpack_require__.r(__webpack_exports__);
icon: 'fas fa-reply',
children: app.translator.trans('core.forum.discussion_controls.cannot_reply_button'),
className: 'disabled',
title: app.translator.trans('core.forum.discussion_controls.cannot_reply_text')
title: app.translator.transText('core.forum.discussion_controls.cannot_reply_text')
}));
}

2
js/dist/forum.js.map vendored
View File

File diff suppressed because one or more lines are too long

5
js/src/forum/components/DiscussionPage.tsx
View File

@ -272,12 +272,13 @@ export default class DiscussionPage extends Page {
positionChanged(startNumber: number, endNumber: number) {
const discussion = this.discussion;
if (!discussion) return;
// Construct a URL to this discussion with the updated position, then
// replace it into the window's history and our own history stack.
const url = app.route.discussion(discussion, (this.near = startNumber));
m.route.set(url, true);
window.history.replaceState(null, document.title, url);
m.route.set(url, true, { replace: true });
app.history.push('discussion', discussion.title());