github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-26 04:01:52 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "FIX: reverts #18e2816 (#7940)"

Browse Source 
This reverts commit c7b146cbdfda41494c350a58982d2fe54893d2c1.
This commit is contained in:
Guo Xiang Tan
2019-07-25 19:59:24 +08:00
parent d83f99fc2e
commit c7516c42e9
5 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/discourse/controllers/topic.js.es6
View File

@ -722,6 +722,11 @@ export default Ember.Controller.extend(bufferedProperty("model"), {
this._jumpToPostId(postId); this._jumpToPostId(postId);
}, },
hideMultiSelect() {
this.set("multiSelect", false);
this._forceRefreshPostStream();
},
toggleMultiSelect() { toggleMultiSelect() {
this.toggleProperty("multiSelect"); this.toggleProperty("multiSelect");
this._forceRefreshPostStream(); this._forceRefreshPostStream();

1
app/assets/javascripts/discourse/templates/components/topic-footer-buttons.hbs
View File

@ -4,6 +4,7 @@
topic=topic topic=topic
openUpwards="true" openUpwards="true"
toggleMultiSelect=toggleMultiSelect toggleMultiSelect=toggleMultiSelect
hideMultiSelect=hideMultiSelect
deleteTopic=deleteTopic deleteTopic=deleteTopic
recoverTopic=recoverTopic recoverTopic=recoverTopic
toggleClosed=toggleClosed toggleClosed=toggleClosed

4
app/assets/javascripts/discourse/templates/topic.hbs
View File

@ -95,6 +95,7 @@
topic=model topic=model
fixed="true" fixed="true"
toggleMultiSelect=(action "toggleMultiSelect") toggleMultiSelect=(action "toggleMultiSelect")
hideMultiSelect=(action "hideMultiSelect")
deleteTopic=(action "deleteTopic") deleteTopic=(action "deleteTopic")
recoverTopic=(action "recoverTopic") recoverTopic=(action "recoverTopic")
toggleClosed=(action "toggleClosed") toggleClosed=(action "toggleClosed")
@ -122,6 +123,7 @@
jumpToIndex=(action "jumpToIndex") jumpToIndex=(action "jumpToIndex")
replyToPost=(action "replyToPost") replyToPost=(action "replyToPost")
toggleMultiSelect=(action "toggleMultiSelect") toggleMultiSelect=(action "toggleMultiSelect")
hideMultiSelect=(action "hideMultiSelect")
deleteTopic=(action "deleteTopic") deleteTopic=(action "deleteTopic")
recoverTopic=(action "recoverTopic") recoverTopic=(action "recoverTopic")
toggleClosed=(action "toggleClosed") toggleClosed=(action "toggleClosed")
@ -145,6 +147,7 @@
openUpwards="true" openUpwards="true"
rightSide="true" rightSide="true"
toggleMultiSelect=(action "toggleMultiSelect") toggleMultiSelect=(action "toggleMultiSelect")
hideMultiSelect=(action "hideMultiSelect")
deleteTopic=(action "deleteTopic") deleteTopic=(action "deleteTopic")
recoverTopic=(action "recoverTopic") recoverTopic=(action "recoverTopic")
toggleClosed=(action "toggleClosed") toggleClosed=(action "toggleClosed")
@ -291,6 +294,7 @@
{{topic-footer-buttons {{topic-footer-buttons
topic=model topic=model
toggleMultiSelect=(action "toggleMultiSelect") toggleMultiSelect=(action "toggleMultiSelect")
hideMultiSelect=(action "hideMultiSelect")
deleteTopic=(action "deleteTopic") deleteTopic=(action "deleteTopic")
recoverTopic=(action "recoverTopic") recoverTopic=(action "recoverTopic")
toggleClosed=(action "toggleClosed") toggleClosed=(action "toggleClosed")

1
app/assets/javascripts/discourse/widgets/topic-admin-menu.js.es6
View File

@ -90,6 +90,7 @@ createWidget("topic-admin-menu-button", {
position.left += $button.width() - 203; position.left += $button.width() - 203;
} }
this.state.position = position; this.state.position = position;
this.sendWidgetAction("hideMultiSelect");
} }
}); });

7
test/javascripts/acceptance/topic-test.js.es6
View File

@ -255,6 +255,13 @@ QUnit.test("selecting posts", async assert => {
exists(".select-all"), exists(".select-all"),
"it should allow users to select all the posts" "it should allow users to select all the posts"
); );
await click(".toggle-admin-menu");
assert.ok(
exists(".selected-posts.hidden"),
"it should hide the multi select menu"
);
}); });
QUnit.test("select below", async assert => { QUnit.test("select below", async assert => {