github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 14:12:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Support and examples for Ember.Object and Ember.Controller imports

Browse Source 
We should stop using global variables and instead import these as
needed.
This commit is contained in:
Robin Ward
2019-10-23 12:55:11 -04:00
parent 0b37a3c235
commit e18af18fec
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/admin/controllers/admin-api-keys.js.es6
View File

@ -1,7 +1,8 @@
import ApiKey from "admin/models/api-key"; import ApiKey from "admin/models/api-key";
import { default as computed } from "ember-addons/ember-computed-decorators"; import { default as computed } from "ember-addons/ember-computed-decorators";
import Controller from "@ember/controller";
export default Ember.Controller.extend({ export default Controller.extend({
@computed("model.[]") @computed("model.[]")
hasMasterKey(model) { hasMasterKey(model) {
return !!model.findBy("user", null); return !!model.findBy("user", null);

3
app/assets/javascripts/admin/models/watched-word.js.es6
View File

@ -1,4 +1,5 @@
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
import EmberObject from "@ember/object";
const WatchedWord = Discourse.Model.extend({ const WatchedWord = Discourse.Model.extend({
save() { save() {
@ -37,7 +38,7 @@ WatchedWord.reopenClass({
}); });
return Object.keys(actions).map(n => { return Object.keys(actions).map(n => {
return Ember.Object.create({ return EmberObject.create({
nameKey: n, nameKey: n,
name: I18n.t("admin.watched_words.actions." + n), name: I18n.t("admin.watched_words.actions." + n),
words: actions[n], words: actions[n],

2
app/assets/javascripts/discourse-loader.js
View File

@ -6,6 +6,8 @@ var define, requirejs;
if (typeof Ember !== "undefined") { if (typeof Ember !== "undefined") {
EMBER_MODULES = { EMBER_MODULES = {
"@ember/component": { default: Ember.Component }, "@ember/component": { default: Ember.Component },
"@ember/controller": { default: Ember.Controller },
"@ember/object": { default: Ember.Object },
"@ember/routing/route": { default: Ember.Route } "@ember/routing/route": { default: Ember.Route }
}; };
} }