From 277346b09709deac714d70c8cbd525f69f0984b4 Mon Sep 17 00:00:00 2001 From: Penar Musaraj Date: Wed, 19 Feb 2020 11:57:59 -0500 Subject: [PATCH] DEV: Find/replace deprecated decorators --- .../discourse/components/explorer-container.js.es6 | 2 +- .../discourse/components/explorer-schema-enuminfo.js.es6 | 2 +- .../discourse/components/explorer-schema-onetable.js.es6 | 2 +- .../javascripts/discourse/components/explorer-schema.js.es6 | 2 +- .../discourse/components/json-file-uploader.js.es6 | 2 +- assets/javascripts/discourse/components/param-input.js.es6 | 2 +- assets/javascripts/discourse/components/query-result.js.es6 | 2 +- assets/javascripts/discourse/components/share-report.js.es6 | 5 +---- .../discourse/controllers/admin-plugins-explorer.js.es6 | 2 +- assets/javascripts/discourse/controllers/import-query.js.es6 | 2 +- assets/javascripts/discourse/models/query.js.es6 | 2 +- 11 files changed, 11 insertions(+), 14 deletions(-) diff --git a/assets/javascripts/discourse/components/explorer-container.js.es6 b/assets/javascripts/discourse/components/explorer-container.js.es6 index adf7244..ff93dfb 100644 --- a/assets/javascripts/discourse/components/explorer-container.js.es6 +++ b/assets/javascripts/discourse/components/explorer-container.js.es6 @@ -1,4 +1,4 @@ -import { observes } from "ember-addons/ember-computed-decorators"; +import { observes } from "discourse-common/utils/decorators"; export default Ember.Component.extend({ @observes("hideSchema") diff --git a/assets/javascripts/discourse/components/explorer-schema-enuminfo.js.es6 b/assets/javascripts/discourse/components/explorer-schema-enuminfo.js.es6 index ba2c1f2..b35b780 100644 --- a/assets/javascripts/discourse/components/explorer-schema-enuminfo.js.es6 +++ b/assets/javascripts/discourse/components/explorer-schema-enuminfo.js.es6 @@ -1,4 +1,4 @@ -import { default as computed } from "ember-addons/ember-computed-decorators"; +import { default as computed } from "discourse-common/utils/decorators"; export default Ember.Component.extend({ tagName: "ol", diff --git a/assets/javascripts/discourse/components/explorer-schema-onetable.js.es6 b/assets/javascripts/discourse/components/explorer-schema-onetable.js.es6 index a3ad160..ace12e1 100644 --- a/assets/javascripts/discourse/components/explorer-schema-onetable.js.es6 +++ b/assets/javascripts/discourse/components/explorer-schema-onetable.js.es6 @@ -1,4 +1,4 @@ -import { on } from "ember-addons/ember-computed-decorators"; +import { on } from "discourse-common/utils/decorators"; export default Ember.Component.extend({ classNameBindings: [":schema-table", "open"], diff --git a/assets/javascripts/discourse/components/explorer-schema.js.es6 b/assets/javascripts/discourse/components/explorer-schema.js.es6 index 6f1d51b..ab69109 100644 --- a/assets/javascripts/discourse/components/explorer-schema.js.es6 +++ b/assets/javascripts/discourse/components/explorer-schema.js.es6 @@ -1,7 +1,7 @@ import { default as computed, observes -} from "ember-addons/ember-computed-decorators"; +} from "discourse-common/utils/decorators"; import debounce from "discourse/lib/debounce"; export default Ember.Component.extend({ diff --git a/assets/javascripts/discourse/components/json-file-uploader.js.es6 b/assets/javascripts/discourse/components/json-file-uploader.js.es6 index 706e9c7..3b0549e 100644 --- a/assets/javascripts/discourse/components/json-file-uploader.js.es6 +++ b/assets/javascripts/discourse/components/json-file-uploader.js.es6 @@ -2,7 +2,7 @@ import { default as computed, on, observes -} from "ember-addons/ember-computed-decorators"; +} from "discourse-common/utils/decorators"; export default Ember.Component.extend({ fileInput: null, diff --git a/assets/javascripts/discourse/components/param-input.js.es6 b/assets/javascripts/discourse/components/param-input.js.es6 index cb8334a..3d42511 100644 --- a/assets/javascripts/discourse/components/param-input.js.es6 +++ b/assets/javascripts/discourse/components/param-input.js.es6 @@ -1,4 +1,4 @@ -import { default as computed } from "ember-addons/ember-computed-decorators"; +import { default as computed } from "discourse-common/utils/decorators"; // import Category from 'discourse/models/category'; const Category = Discourse.Category; diff --git a/assets/javascripts/discourse/components/query-result.js.es6 b/assets/javascripts/discourse/components/query-result.js.es6 index d359c00..0eb4ab2 100644 --- a/assets/javascripts/discourse/components/query-result.js.es6 +++ b/assets/javascripts/discourse/components/query-result.js.es6 @@ -1,7 +1,7 @@ import { ajax } from "discourse/lib/ajax"; import Badge from "discourse/models/badge"; import { getOwner } from "discourse-common/lib/get-owner"; -import { default as computed } from "ember-addons/ember-computed-decorators"; +import { default as computed } from "discourse-common/utils/decorators"; function randomIdShort() { return "xxxxxxxx".replace(/[xy]/g, () => { diff --git a/assets/javascripts/discourse/components/share-report.js.es6 b/assets/javascripts/discourse/components/share-report.js.es6 index 65805b1..ac5ab14 100644 --- a/assets/javascripts/discourse/components/share-report.js.es6 +++ b/assets/javascripts/discourse/components/share-report.js.es6 @@ -1,7 +1,4 @@ -import { - default as computed, - on -} from "ember-addons/ember-computed-decorators"; +import { default as computed, on } from "discourse-common/utils/decorators"; export default Ember.Component.extend({ classNames: ["share-report"], diff --git a/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6 b/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6 index dc36064..45abb25 100644 --- a/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6 +++ b/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6 @@ -5,7 +5,7 @@ import { ajax } from "discourse/lib/ajax"; import { default as computed, observes -} from "ember-addons/ember-computed-decorators"; +} from "discourse-common/utils/decorators"; const NoQuery = Query.create({ name: "No queries", fake: true, group_ids: [] }); diff --git a/assets/javascripts/discourse/controllers/import-query.js.es6 b/assets/javascripts/discourse/controllers/import-query.js.es6 index 9327fa6..21d6411 100644 --- a/assets/javascripts/discourse/controllers/import-query.js.es6 +++ b/assets/javascripts/discourse/controllers/import-query.js.es6 @@ -1,4 +1,4 @@ -import { default as computed } from "ember-addons/ember-computed-decorators"; +import { default as computed } from "discourse-common/utils/decorators"; import ModalFunctionality from "discourse/mixins/modal-functionality"; import { popupAjaxError } from "discourse/lib/ajax-error"; diff --git a/assets/javascripts/discourse/models/query.js.es6 b/assets/javascripts/discourse/models/query.js.es6 index 501db9a..ae5db8c 100644 --- a/assets/javascripts/discourse/models/query.js.es6 +++ b/assets/javascripts/discourse/models/query.js.es6 @@ -2,7 +2,7 @@ import { default as computed, on, observes -} from "ember-addons/ember-computed-decorators"; +} from "discourse-common/utils/decorators"; import RestModel from "discourse/models/rest"; const Query = RestModel.extend({