mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-06-04 05:35:55 +02:00
Code Issues Releases Wiki Activity

Merge pull request from sijad/no-confirm

Browse Source 
Remove "Mark as Read" confirmation fixes
This commit is contained in:
Toby Zerner 2016-02-10 18:13:38 +10:30
commit 89598646c1
2 changed files with 4 additions and 12 deletions
js/forum
dist
app.js
src/components
DiscussionListItem.js

8
js/forum/dist/app.js vendored

@ -21671,12 +21671,8 @@ System.register('flarum/components/DiscussionListItem', ['flarum/Component', 'fl
var discussion = this.props.discussion;
if (discussion.isUnread()) {
var confirmation = confirm(app.translator.trans('core.forum.discussion_list.mark_all_as_read_confirmation'));
if (confirmation) {
discussion.save({ readNumber: discussion.lastPostNumber() });
m.redraw();
}
discussion.save({ readNumber: discussion.lastPostNumber() });
m.redraw();
}
}

8
js/forum/src/components/DiscussionListItem.js

@ -174,12 +174,8 @@ export default class DiscussionListItem extends Component {
const discussion = this.props.discussion;
if (discussion.isUnread()) {
const confirmation = confirm(app.translator.trans('core.forum.discussion_list.mark_all_as_read_confirmation'));
if (confirmation) {
discussion.save({readNumber: discussion.lastPostNumber()});
m.redraw();
}
discussion.save({readNumber: discussion.lastPostNumber()});
m.redraw();
}
}