IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Deprecate ember module imports (#9011)

Browse Source 
Removes remaining `ember` module imports.
This commit is contained in:
Jarek Radosz
2020-02-21 15:56:49 +01:00
committed by GitHub
parent c607870f08
commit 6ba326a9f4
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/controllers/reorder-categories.js.es6
View File

@@ -1,4 +1,5 @@
import { sort } from "@ember/object/computed"; import { sort } from "@ember/object/computed";
import Evented from "@ember/object/evented";
import EmberObjectProxy from "@ember/object/proxy"; import EmberObjectProxy from "@ember/object/proxy";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import { ajax } from "discourse/lib/ajax"; import { ajax } from "discourse/lib/ajax";
@@ -6,9 +7,8 @@ import ModalFunctionality from "discourse/mixins/modal-functionality";
const BufferedProxy = window.BufferedProxy; // import BufferedProxy from 'ember-buffered-proxy/proxy'; const BufferedProxy = window.BufferedProxy; // import BufferedProxy from 'ember-buffered-proxy/proxy';
import { popupAjaxError } from "discourse/lib/ajax-error"; import { popupAjaxError } from "discourse/lib/ajax-error";
import discourseComputed, { on } from "discourse-common/utils/decorators"; import discourseComputed, { on } from "discourse-common/utils/decorators";
import Ember from "ember";
export default Controller.extend(ModalFunctionality, Ember.Evented, { export default Controller.extend(ModalFunctionality, Evented, {
init() { init() {
this._super(...arguments); this._super(...arguments);

6
app/assets/javascripts/ember-addons/fmt.js.es6
View File

@@ -1,11 +1,7 @@
import Ember from "ember";
const isArray = Ember.isArray;
export default function(str, formats) { export default function(str, formats) {
let cachedFormats = formats; let cachedFormats = formats;
if (!isArray(cachedFormats) || arguments.length > 2) { if (!_.isArray(cachedFormats) || arguments.length > 2) {
cachedFormats = new Array(arguments.length - 1); cachedFormats = new Array(arguments.length - 1);
for (let i = 1, l = arguments.length; i < l; i++) { for (let i = 1, l = arguments.length; i < l; i++) {

4
app/assets/javascripts/ember-addons/utils/handle-descriptor.js.es6
View File

@@ -1,8 +1,6 @@
import Ember from "ember"; import { computed, get } from "@ember/object";
import extractValue from "./extract-value"; import extractValue from "./extract-value";
const { computed, get } = Ember;
export default function handleDescriptor(target, key, desc, params = []) { export default function handleDescriptor(target, key, desc, params = []) {
return { return {
enumerable: desc.enumerable, enumerable: desc.enumerable,

12
app/assets/javascripts/ember-shim.js
View File

@@ -1,4 +1,14 @@
// Allow us to import Ember // Allow us to import Ember
define('ember', ['exports'], function(__exports__) { define("ember", ["exports"], function(__exports__) {
// eslint-disable-next-line no-console
console.warn(
[
"Deprecation notice:",
"Use specific `@ember/*` imports instead of `ember`",
"(deprecated since Discourse 2.4.0)",
"(removal in Discourse 2.5.0)"
].join(" ")
);
__exports__.default = Ember; __exports__.default = Ember;
}); });