github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 07:11:34 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: upgrades from Ember 2.13 to Ember 3.5.1 (#6808)

Browse Source 
Co-Authored-By: Bianca Nenciu <nbianca@users.noreply.github.com>
Co-Authored-By: David Taylor <david@taylorhq.com>
This commit is contained in:
Joffrey JAFFEUX
2019-01-10 11:06:01 +01:00
committed by GitHub
parent 7896c74c2b
commit f9648de897
318 changed files with 1684 additions and 1462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/assets/javascripts/select-kit/components/composer-actions.js.es6
View File

@ -19,7 +19,6 @@ export function _clearSnapshots() {
}
export default DropdownSelectBoxComponent.extend({
composerController: Ember.inject.controller("composer"),
pluginApiIdentifiers: ["composer-actions"],
classNames: "composer-actions",
fullWidthOnMobile: true,
@ -210,38 +209,14 @@ export default DropdownSelectBoxComponent.extend({
},
_replyFromExisting(options, post, topic) {
const reply = this.get("composerModel.reply");
this.closeComposer();
let url;
if (post) url = post.get("url");
if (!post && topic) url = topic.get("url");
let topicTitle;
if (topic) topicTitle = topic.get("title");
this.get("composerController").close();
this.get("composerController")
.open(options)
.then(() => {
if (!url || !topicTitle) return;
url = `${location.protocol}//${location.host}${url}`;
const link = `[${Handlebars.escapeExpression(topicTitle)}](${url})`;
const continueDiscussion = I18n.t("post.continue_discussion", {
postLink: link
});
if (!reply.includes(continueDiscussion)) {
this.get("composerController")
.get("model")
.prependText(continueDiscussion, { new_line: true });
}
});
this.openComposer(options, post, topic);
},
_openComposer(options) {
this.get("composerController").close();
this.get("composerController").open(options);
this.closeComposer();
this.openComposer(options);
},
toggleWhisperSelected(options, model) {
@ -323,7 +298,8 @@ export default DropdownSelectBoxComponent.extend({
model
);
} else {
Ember.Logger.error(`No method '${action}' found`);
// eslint-disable-next-line no-console
console.error(`No method '${action}' found`);
}
}
}