From 5037b80c9c6e94ad01fb2f7b7971a2d533bd3c94 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Mon, 9 Mar 2020 17:38:37 +0100 Subject: [PATCH] Merge imports from the same module (#9144) --- .../admin/components/admin-report-chart.js.es6 | 3 +-- .../admin/components/admin-report-stacked-chart.js.es6 | 3 +-- .../javascripts/admin/components/resumable-upload.js.es6 | 3 +-- .../discourse/components/composer-editor.js.es6 | 6 +----- .../discourse/components/composer-title.js.es6 | 4 +--- .../javascripts/discourse/components/d-editor.js.es6 | 6 +----- .../discourse/components/discourse-topic.js.es6 | 5 +---- .../discourse/components/discovery-topics-list.js.es6 | 3 +-- .../javascripts/discourse/components/global-notice.js.es6 | 3 +-- .../javascripts/discourse/components/invite-panel.js.es6 | 3 +-- .../javascripts/discourse/components/mount-widget.js.es6 | 3 +-- .../discourse/components/scrolling-post-stream.js.es6 | 4 +--- .../discourse/components/search-advanced-options.js.es6 | 3 +-- .../javascripts/discourse/components/share-popup.js.es6 | 3 +-- .../javascripts/discourse/components/site-header.js.es6 | 4 +--- .../discourse/components/suggested-topics.js.es6 | 3 +-- .../discourse/components/topic-timer-info.js.es6 | 3 +-- .../discourse/components/user-card-contents.js.es6 | 3 +-- .../discourse/controllers/edit-topic-timer.js.es6 | 3 +-- .../discourse/controllers/insert-hyperlink.js.es6 | 4 +--- app/assets/javascripts/discourse/controllers/user.js.es6 | 3 +-- .../initializers/subscribe-user-notifications.js.es6 | 3 +-- app/assets/javascripts/discourse/lib/autocomplete.js.es6 | 3 +-- .../javascripts/discourse/lib/keyboard-shortcuts.js.es6 | 3 +-- app/assets/javascripts/discourse/lib/url.js.es6 | 3 +-- .../discourse/mixins/card-contents-base.js.es6 | 4 +--- app/assets/javascripts/discourse/models/composer.js.es6 | 8 ++------ app/assets/javascripts/discourse/models/post.js.es6 | 3 +-- app/assets/javascripts/discourse/models/site.js.es6 | 3 +-- app/assets/javascripts/discourse/models/store.js.es6 | 3 +-- .../discourse/models/topic-tracking-state.js.es6 | 3 +-- app/assets/javascripts/discourse/models/topic.js.es6 | 3 +-- app/assets/javascripts/discourse/models/user.js.es6 | 3 +-- .../javascripts/discourse/routes/application.js.es6 | 3 +-- app/assets/javascripts/discourse/routes/topic.js.es6 | 4 +--- app/assets/javascripts/discourse/services/search.js.es6 | 3 +-- app/assets/javascripts/discourse/widgets/glue.js.es6 | 3 +-- app/assets/javascripts/discourse/widgets/post-menu.js.es6 | 3 +-- .../javascripts/discourse/widgets/search-menu.js.es6 | 3 +-- .../javascripts/select-kit/components/select-kit.js.es6 | 3 +-- .../select-kit/components/selected-name.js.es6 | 3 +-- .../discourse/components/composer-presence-display.js.es6 | 4 +--- .../discourse/components/topic-presence-display.js.es6 | 3 +-- 43 files changed, 44 insertions(+), 105 deletions(-) diff --git a/app/assets/javascripts/admin/components/admin-report-chart.js.es6 b/app/assets/javascripts/admin/components/admin-report-chart.js.es6 index 5351a11952c..7af8ce04745 100644 --- a/app/assets/javascripts/admin/components/admin-report-chart.js.es6 +++ b/app/assets/javascripts/admin/components/admin-report-chart.js.es6 @@ -1,6 +1,5 @@ import { makeArray } from "discourse-common/lib/helpers"; -import { debounce } from "@ember/runloop"; -import { schedule } from "@ember/runloop"; +import { debounce, schedule } from "@ember/runloop"; import Component from "@ember/component"; import { number } from "discourse/lib/formatter"; import loadScript from "discourse/lib/load-script"; diff --git a/app/assets/javascripts/admin/components/admin-report-stacked-chart.js.es6 b/app/assets/javascripts/admin/components/admin-report-stacked-chart.js.es6 index 911d858ba9c..8980c93077f 100644 --- a/app/assets/javascripts/admin/components/admin-report-stacked-chart.js.es6 +++ b/app/assets/javascripts/admin/components/admin-report-stacked-chart.js.es6 @@ -1,6 +1,5 @@ import { makeArray } from "discourse-common/lib/helpers"; -import { debounce } from "@ember/runloop"; -import { schedule } from "@ember/runloop"; +import { debounce, schedule } from "@ember/runloop"; import Component from "@ember/component"; import { number } from "discourse/lib/formatter"; import loadScript from "discourse/lib/load-script"; diff --git a/app/assets/javascripts/admin/components/resumable-upload.js.es6 b/app/assets/javascripts/admin/components/resumable-upload.js.es6 index 830e5602520..7425f174fea 100644 --- a/app/assets/javascripts/admin/components/resumable-upload.js.es6 +++ b/app/assets/javascripts/admin/components/resumable-upload.js.es6 @@ -1,5 +1,4 @@ -import { schedule } from "@ember/runloop"; -import { later } from "@ember/runloop"; +import { later, schedule } from "@ember/runloop"; import Component from "@ember/component"; import { iconHTML } from "discourse-common/lib/icon-library"; import discourseComputed, { on } from "discourse-common/utils/decorators"; diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6 index 52f44e78f59..4ff3b961b10 100644 --- a/app/assets/javascripts/discourse/components/composer-editor.js.es6 +++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6 @@ -1,8 +1,4 @@ -import { throttle } from "@ember/runloop"; -import { next } from "@ember/runloop"; -import { debounce } from "@ember/runloop"; -import { scheduleOnce } from "@ember/runloop"; -import { later } from "@ember/runloop"; +import { debounce, later, next, scheduleOnce, throttle } from "@ember/runloop"; import Component from "@ember/component"; import userSearch from "discourse/lib/user-search"; import discourseComputed, { diff --git a/app/assets/javascripts/discourse/components/composer-title.js.es6 b/app/assets/javascripts/discourse/components/composer-title.js.es6 index bd559a59f10..9ba4f501bfb 100644 --- a/app/assets/javascripts/discourse/components/composer-title.js.es6 +++ b/app/assets/javascripts/discourse/components/composer-title.js.es6 @@ -1,7 +1,5 @@ import { alias, or } from "@ember/object/computed"; -import { next } from "@ember/runloop"; -import { debounce } from "@ember/runloop"; -import { schedule } from "@ember/runloop"; +import { debounce, next, schedule } from "@ember/runloop"; import Component from "@ember/component"; import discourseComputed, { observes } from "discourse-common/utils/decorators"; import { load } from "pretty-text/oneboxer"; diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6 index d9f156b63b2..b83b667bca7 100644 --- a/app/assets/javascripts/discourse/components/d-editor.js.es6 +++ b/app/assets/javascripts/discourse/components/d-editor.js.es6 @@ -1,8 +1,4 @@ -import { next } from "@ember/runloop"; -import { debounce } from "@ember/runloop"; -import { schedule } from "@ember/runloop"; -import { scheduleOnce } from "@ember/runloop"; -import { later } from "@ember/runloop"; +import { debounce, later, next, schedule, scheduleOnce } from "@ember/runloop"; import { inject as service } from "@ember/service"; import Component from "@ember/component"; /*global Mousetrap:true */ diff --git a/app/assets/javascripts/discourse/components/discourse-topic.js.es6 b/app/assets/javascripts/discourse/components/discourse-topic.js.es6 index 83e7bf6fa1f..7e222e2e61e 100644 --- a/app/assets/javascripts/discourse/components/discourse-topic.js.es6 +++ b/app/assets/javascripts/discourse/components/discourse-topic.js.es6 @@ -1,8 +1,5 @@ import { alias } from "@ember/object/computed"; -import { throttle } from "@ember/runloop"; -import { schedule } from "@ember/runloop"; -import { scheduleOnce } from "@ember/runloop"; -import { later } from "@ember/runloop"; +import { later, schedule, scheduleOnce, throttle } from "@ember/runloop"; import Component from "@ember/component"; import DiscourseURL from "discourse/lib/url"; import AddArchetypeClass from "discourse/mixins/add-archetype-class"; diff --git a/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6 b/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6 index f4329ba2f2c..30a0118a339 100644 --- a/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6 +++ b/app/assets/javascripts/discourse/components/discovery-topics-list.js.es6 @@ -1,5 +1,4 @@ -import { schedule } from "@ember/runloop"; -import { scheduleOnce } from "@ember/runloop"; +import { schedule, scheduleOnce } from "@ember/runloop"; import Component from "@ember/component"; import { on, observes } from "discourse-common/utils/decorators"; import LoadMore from "discourse/mixins/load-more"; diff --git a/app/assets/javascripts/discourse/components/global-notice.js.es6 b/app/assets/javascripts/discourse/components/global-notice.js.es6 index 8ca725abaa5..abaf7306725 100644 --- a/app/assets/javascripts/discourse/components/global-notice.js.es6 +++ b/app/assets/javascripts/discourse/components/global-notice.js.es6 @@ -1,8 +1,7 @@ import { bind, cancel } from "@ember/runloop"; import Component from "@ember/component"; import LogsNotice from "discourse/services/logs-notice"; -import EmberObject from "@ember/object"; -import { computed } from "@ember/object"; +import EmberObject, { computed } from "@ember/object"; const _pluginNotices = []; diff --git a/app/assets/javascripts/discourse/components/invite-panel.js.es6 b/app/assets/javascripts/discourse/components/invite-panel.js.es6 index 8622e97ac58..07488091316 100644 --- a/app/assets/javascripts/discourse/components/invite-panel.js.es6 +++ b/app/assets/javascripts/discourse/components/invite-panel.js.es6 @@ -1,8 +1,7 @@ import discourseComputed from "discourse-common/utils/decorators"; import { isEmpty } from "@ember/utils"; -import { computed } from "@ember/object"; +import EmberObject, { computed } from "@ember/object"; import { alias, and, equal } from "@ember/object/computed"; -import EmberObject from "@ember/object"; import Component from "@ember/component"; import { emailValid } from "discourse/lib/utilities"; import Group from "discourse/models/group"; diff --git a/app/assets/javascripts/discourse/components/mount-widget.js.es6 b/app/assets/javascripts/discourse/components/mount-widget.js.es6 index e62b7acab39..dc98bf9f6da 100644 --- a/app/assets/javascripts/discourse/components/mount-widget.js.es6 +++ b/app/assets/javascripts/discourse/components/mount-widget.js.es6 @@ -1,5 +1,4 @@ -import { cancel } from "@ember/runloop"; -import { scheduleOnce } from "@ember/runloop"; +import { cancel, scheduleOnce } from "@ember/runloop"; import Component from "@ember/component"; import { diff, patch } from "virtual-dom"; import { WidgetClickHook } from "discourse/widgets/hooks"; diff --git a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6 b/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6 index 04f0897eb65..cb9b3dac27a 100644 --- a/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6 +++ b/app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6 @@ -1,6 +1,4 @@ -import { next } from "@ember/runloop"; -import { debounce } from "@ember/runloop"; -import { scheduleOnce } from "@ember/runloop"; +import { debounce, next, scheduleOnce } from "@ember/runloop"; import DiscourseURL from "discourse/lib/url"; import MountWidget from "discourse/components/mount-widget"; import { cloak, uncloak } from "discourse/widgets/post-stream"; diff --git a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6 b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6 index eb61067167a..9b3bac5035b 100644 --- a/app/assets/javascripts/discourse/components/search-advanced-options.js.es6 +++ b/app/assets/javascripts/discourse/components/search-advanced-options.js.es6 @@ -1,5 +1,4 @@ -import { debounce } from "@ember/runloop"; -import { scheduleOnce } from "@ember/runloop"; +import { debounce, scheduleOnce } from "@ember/runloop"; import Component from "@ember/component"; import { observes } from "discourse-common/utils/decorators"; import { escapeExpression } from "discourse/lib/utilities"; diff --git a/app/assets/javascripts/discourse/components/share-popup.js.es6 b/app/assets/javascripts/discourse/components/share-popup.js.es6 index ba32b26585f..ca86058b73e 100644 --- a/app/assets/javascripts/discourse/components/share-popup.js.es6 +++ b/app/assets/javascripts/discourse/components/share-popup.js.es6 @@ -1,6 +1,5 @@ import { isEmpty } from "@ember/utils"; -import { bind } from "@ember/runloop"; -import { scheduleOnce } from "@ember/runloop"; +import { bind, scheduleOnce } from "@ember/runloop"; import Component from "@ember/component"; import { wantsNewWindow } from "discourse/lib/intercept-click"; import { longDateNoYear } from "discourse/lib/formatter"; diff --git a/app/assets/javascripts/discourse/components/site-header.js.es6 b/app/assets/javascripts/discourse/components/site-header.js.es6 index 38d42d9ea01..b8b6ed90e3a 100644 --- a/app/assets/javascripts/discourse/components/site-header.js.es6 +++ b/app/assets/javascripts/discourse/components/site-header.js.es6 @@ -1,6 +1,4 @@ -import { cancel } from "@ember/runloop"; -import { schedule } from "@ember/runloop"; -import { later } from "@ember/runloop"; +import { cancel, later, schedule } from "@ember/runloop"; import MountWidget from "discourse/components/mount-widget"; import { observes } from "discourse-common/utils/decorators"; import Docking from "discourse/mixins/docking"; diff --git a/app/assets/javascripts/discourse/components/suggested-topics.js.es6 b/app/assets/javascripts/discourse/components/suggested-topics.js.es6 index 53986a8303b..9d5b83839ad 100644 --- a/app/assets/javascripts/discourse/components/suggested-topics.js.es6 +++ b/app/assets/javascripts/discourse/components/suggested-topics.js.es6 @@ -1,9 +1,8 @@ import discourseComputed from "discourse-common/utils/decorators"; -import { get } from "@ember/object"; +import { computed, get } from "@ember/object"; import Component from "@ember/component"; import { categoryBadgeHTML } from "discourse/helpers/category-link"; import Site from "discourse/models/site"; -import { computed } from "@ember/object"; export default Component.extend({ elementId: "suggested-topics", diff --git a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6 b/app/assets/javascripts/discourse/components/topic-timer-info.js.es6 index 4b758ed6a24..66663b062dd 100644 --- a/app/assets/javascripts/discourse/components/topic-timer-info.js.es6 +++ b/app/assets/javascripts/discourse/components/topic-timer-info.js.es6 @@ -1,6 +1,5 @@ import discourseComputed from "discourse-common/utils/decorators"; -import { cancel } from "@ember/runloop"; -import { later } from "@ember/runloop"; +import { cancel, later } from "@ember/runloop"; import Component from "@ember/component"; import { iconHTML } from "discourse-common/lib/icon-library"; import Category from "discourse/models/category"; diff --git a/app/assets/javascripts/discourse/components/user-card-contents.js.es6 b/app/assets/javascripts/discourse/components/user-card-contents.js.es6 index ca6ec7dbda2..5ad24526dc0 100644 --- a/app/assets/javascripts/discourse/components/user-card-contents.js.es6 +++ b/app/assets/javascripts/discourse/components/user-card-contents.js.es6 @@ -1,6 +1,6 @@ import { isEmpty } from "@ember/utils"; import { alias, gte, and, gt, not, or } from "@ember/object/computed"; -import EmberObject from "@ember/object"; +import EmberObject, { set } from "@ember/object"; import Component from "@ember/component"; import discourseComputed, { observes } from "discourse-common/utils/decorators"; import User from "discourse/models/user"; @@ -10,7 +10,6 @@ import CanCheckEmails from "discourse/mixins/can-check-emails"; import CardContentsBase from "discourse/mixins/card-contents-base"; import CleansUp from "discourse/mixins/cleans-up"; import { prioritizeNameInUx } from "discourse/lib/settings"; -import { set } from "@ember/object"; import { getOwner } from "@ember/application"; export default Component.extend(CardContentsBase, CanCheckEmails, CleansUp, { diff --git a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6 b/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6 index a410f1fc901..e9117532f05 100644 --- a/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6 +++ b/app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6 @@ -1,10 +1,9 @@ -import EmberObject from "@ember/object"; +import EmberObject, { setProperties } from "@ember/object"; import Controller from "@ember/controller"; import discourseComputed from "discourse-common/utils/decorators"; import ModalFunctionality from "discourse/mixins/modal-functionality"; import TopicTimer from "discourse/models/topic-timer"; import { popupAjaxError } from "discourse/lib/ajax-error"; -import { setProperties } from "@ember/object"; export const CLOSE_STATUS_TYPE = "close"; export const OPEN_STATUS_TYPE = "open"; diff --git a/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6 b/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6 index 21ea0603f82..57d751b56e3 100644 --- a/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6 +++ b/app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6 @@ -1,7 +1,5 @@ import { isEmpty } from "@ember/utils"; -import { debounce } from "@ember/runloop"; -import { cancel } from "@ember/runloop"; -import { scheduleOnce } from "@ember/runloop"; +import { cancel, debounce, scheduleOnce } from "@ember/runloop"; import Controller from "@ember/controller"; import ModalFunctionality from "discourse/mixins/modal-functionality"; import { searchForTerm } from "discourse/lib/search"; diff --git a/app/assets/javascripts/discourse/controllers/user.js.es6 b/app/assets/javascripts/discourse/controllers/user.js.es6 index 90eeb3a837a..cc2db042fbf 100644 --- a/app/assets/javascripts/discourse/controllers/user.js.es6 +++ b/app/assets/javascripts/discourse/controllers/user.js.es6 @@ -1,7 +1,7 @@ import discourseComputed from "discourse-common/utils/decorators"; import { isEmpty } from "@ember/utils"; import { alias, or, gt, not, and } from "@ember/object/computed"; -import EmberObject from "@ember/object"; +import EmberObject, { set, computed } from "@ember/object"; import { inject as service } from "@ember/service"; import { inject } from "@ember/controller"; import Controller from "@ember/controller"; @@ -9,7 +9,6 @@ import CanCheckEmails from "discourse/mixins/can-check-emails"; import User from "discourse/models/user"; import optionalService from "discourse/lib/optional-service"; import { prioritizeNameInUx } from "discourse/lib/settings"; -import { set, computed } from "@ember/object"; export default Controller.extend(CanCheckEmails, { indexStream: false, diff --git a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 index 8efb204c363..14c2bc5f95b 100644 --- a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 +++ b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 @@ -1,4 +1,4 @@ -import EmberObject from "@ember/object"; +import EmberObject, { set } from "@ember/object"; // Subscribes to user events on the message bus import { init as initDesktopNotifications, @@ -11,7 +11,6 @@ import { unsubscribe as unsubscribePushNotifications, isPushNotificationsEnabled } from "discourse/lib/push-notifications"; -import { set } from "@ember/object"; import ENV from "discourse-common/config/environment"; export default { diff --git a/app/assets/javascripts/discourse/lib/autocomplete.js.es6 b/app/assets/javascripts/discourse/lib/autocomplete.js.es6 index aeb7b836a2e..49797604836 100644 --- a/app/assets/javascripts/discourse/lib/autocomplete.js.es6 +++ b/app/assets/javascripts/discourse/lib/autocomplete.js.es6 @@ -1,5 +1,4 @@ -import { cancel } from "@ember/runloop"; -import { later } from "@ember/runloop"; +import { cancel, later } from "@ember/runloop"; import { iconHTML } from "discourse-common/lib/icon-library"; import { setCaretPosition, caretPosition } from "discourse/lib/utilities"; import Site from "discourse/models/site"; diff --git a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 index 409ebc3190c..cf22919b07e 100644 --- a/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 +++ b/app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6 @@ -1,5 +1,4 @@ -import { run } from "@ember/runloop"; -import { later } from "@ember/runloop"; +import { later, run } from "@ember/runloop"; import DiscourseURL from "discourse/lib/url"; import Composer from "discourse/models/composer"; import { minimumOffset } from "discourse/lib/offset-calculator"; diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6 index 93cad9b4c43..7892abafd9c 100644 --- a/app/assets/javascripts/discourse/lib/url.js.es6 +++ b/app/assets/javascripts/discourse/lib/url.js.es6 @@ -1,7 +1,6 @@ import { isEmpty } from "@ember/utils"; import EmberObject from "@ember/object"; -import { next } from "@ember/runloop"; -import { schedule } from "@ember/runloop"; +import { next, schedule } from "@ember/runloop"; import offsetCalculator from "discourse/lib/offset-calculator"; import LockOn from "discourse/lib/lock-on"; import { defaultHomepage } from "discourse/lib/utilities"; diff --git a/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6 b/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6 index c5cdcc4a16f..2f53c5276f6 100644 --- a/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6 +++ b/app/assets/javascripts/discourse/mixins/card-contents-base.js.es6 @@ -1,7 +1,5 @@ import { alias, match } from "@ember/object/computed"; -import { throttle } from "@ember/runloop"; -import { next } from "@ember/runloop"; -import { schedule } from "@ember/runloop"; +import { next, schedule, throttle } from "@ember/runloop"; import { wantsNewWindow } from "discourse/lib/intercept-click"; import afterTransition from "discourse/lib/after-transition"; import DiscourseURL from "discourse/lib/url"; diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6 index 2150396102b..1b53ed8927c 100644 --- a/app/assets/javascripts/discourse/models/composer.js.es6 +++ b/app/assets/javascripts/discourse/models/composer.js.es6 @@ -1,9 +1,7 @@ import { isEmpty } from "@ember/utils"; import { reads, equal, not, or, and } from "@ember/object/computed"; -import EmberObject from "@ember/object"; -import { next } from "@ember/runloop"; -import { cancel } from "@ember/runloop"; -import { later } from "@ember/runloop"; +import EmberObject, { set } from "@ember/object"; +import { cancel, later, next, throttle } from "@ember/runloop"; import RestModel from "discourse/models/rest"; import Topic from "discourse/models/topic"; import { throwAjaxError } from "discourse/lib/ajax-error"; @@ -19,9 +17,7 @@ import { emailValid } from "discourse/lib/utilities"; import { propertyNotEqual } from "discourse/lib/computed"; -import { throttle } from "@ember/runloop"; import { Promise } from "rsvp"; -import { set } from "@ember/object"; import Site from "discourse/models/site"; import User from "discourse/models/user"; import deprecated from "discourse-common/lib/deprecated"; diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6 index a08f960ef09..4ba35b31ac9 100644 --- a/app/assets/javascripts/discourse/models/post.js.es6 +++ b/app/assets/javascripts/discourse/models/post.js.es6 @@ -1,8 +1,7 @@ import discourseComputed from "discourse-common/utils/decorators"; -import { computed, get } from "@ember/object"; +import EmberObject, { computed, get } from "@ember/object"; import { isEmpty } from "@ember/utils"; import { equal, and, or, not } from "@ember/object/computed"; -import EmberObject from "@ember/object"; import { ajax } from "discourse/lib/ajax"; import RestModel from "discourse/models/rest"; import { popupAjaxError } from "discourse/lib/ajax-error"; diff --git a/app/assets/javascripts/discourse/models/site.js.es6 b/app/assets/javascripts/discourse/models/site.js.es6 index 5f9065d3d88..29de94c3a8e 100644 --- a/app/assets/javascripts/discourse/models/site.js.es6 +++ b/app/assets/javascripts/discourse/models/site.js.es6 @@ -1,8 +1,7 @@ import discourseComputed from "discourse-common/utils/decorators"; -import { get } from "@ember/object"; +import EmberObject, { get } from "@ember/object"; import { isEmpty } from "@ember/utils"; import { alias, sort } from "@ember/object/computed"; -import EmberObject from "@ember/object"; import Archetype from "discourse/models/archetype"; import PostActionType from "discourse/models/post-action-type"; import Singleton from "discourse/mixins/singleton"; diff --git a/app/assets/javascripts/discourse/models/store.js.es6 b/app/assets/javascripts/discourse/models/store.js.es6 index 2ee28b66202..1bc9fdf355e 100644 --- a/app/assets/javascripts/discourse/models/store.js.es6 +++ b/app/assets/javascripts/discourse/models/store.js.es6 @@ -1,10 +1,9 @@ -import EmberObject from "@ember/object"; +import EmberObject, { set } from "@ember/object"; import { ajax } from "discourse/lib/ajax"; import RestModel from "discourse/models/rest"; import ResultSet from "discourse/models/result-set"; import { getRegister } from "discourse-common/lib/get-owner"; import { underscore } from "@ember/string"; -import { set } from "@ember/object"; import Category from "discourse/models/category"; import { Promise } from "rsvp"; diff --git a/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6 b/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6 index 8f79703ef71..7debe3f4ce7 100644 --- a/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6 +++ b/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6 @@ -1,10 +1,9 @@ -import { get } from "@ember/object"; +import EmberObject, { get } from "@ember/object"; import { isEmpty } from "@ember/utils"; import { NotificationLevels } from "discourse/lib/notification-levels"; import discourseComputed, { on } from "discourse-common/utils/decorators"; import PreloadStore from "preload-store"; import Category from "discourse/models/category"; -import EmberObject from "@ember/object"; import User from "discourse/models/user"; function isNew(topic) { diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6 index fcf1892ec89..fa97e11ea77 100644 --- a/app/assets/javascripts/discourse/models/topic.js.es6 +++ b/app/assets/javascripts/discourse/models/topic.js.es6 @@ -1,6 +1,5 @@ -import { get } from "@ember/object"; +import EmberObject, { get } from "@ember/object"; import { not, notEmpty, equal, and, or } from "@ember/object/computed"; -import EmberObject from "@ember/object"; import { ajax } from "discourse/lib/ajax"; import { flushMap } from "discourse/models/store"; import RestModel from "discourse/models/rest"; diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6 index b15c868d804..7af461aa309 100644 --- a/app/assets/javascripts/discourse/models/user.js.es6 +++ b/app/assets/javascripts/discourse/models/user.js.es6 @@ -1,7 +1,7 @@ import { A } from "@ember/array"; import { isEmpty } from "@ember/utils"; import { gt, equal, or } from "@ember/object/computed"; -import EmberObject, { computed } from "@ember/object"; +import EmberObject, { computed, getProperties } from "@ember/object"; import { ajax } from "discourse/lib/ajax"; import { url } from "discourse/lib/computed"; import RestModel from "discourse/models/rest"; @@ -22,7 +22,6 @@ import { defaultHomepage } from "discourse/lib/utilities"; import { userPath } from "discourse/lib/url"; import Category from "discourse/models/category"; import { Promise } from "rsvp"; -import { getProperties } from "@ember/object"; import deprecated from "discourse-common/lib/deprecated"; import Site from "discourse/models/site"; diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6 index 8dca333360a..0a028cdcebf 100644 --- a/app/assets/javascripts/discourse/routes/application.js.es6 +++ b/app/assets/javascripts/discourse/routes/application.js.es6 @@ -1,5 +1,4 @@ -import { once } from "@ember/runloop"; -import { next } from "@ember/runloop"; +import { next, once } from "@ember/runloop"; import DiscourseRoute from "discourse/routes/discourse"; import { ajax } from "discourse/lib/ajax"; import { setting } from "discourse/lib/computed"; diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6 index d4c22f9b3e1..33e60412c63 100644 --- a/app/assets/javascripts/discourse/routes/topic.js.es6 +++ b/app/assets/javascripts/discourse/routes/topic.js.es6 @@ -1,8 +1,6 @@ import { get } from "@ember/object"; import { isEmpty } from "@ember/utils"; -import { cancel } from "@ember/runloop"; -import { scheduleOnce } from "@ember/runloop"; -import { later } from "@ember/runloop"; +import { cancel, later, scheduleOnce } from "@ember/runloop"; import DiscourseRoute from "discourse/routes/discourse"; import DiscourseURL from "discourse/lib/url"; import { ID_CONSTRAINT } from "discourse/models/topic"; diff --git a/app/assets/javascripts/discourse/services/search.js.es6 b/app/assets/javascripts/discourse/services/search.js.es6 index d7a8edcd10e..67ad9b16d8e 100644 --- a/app/assets/javascripts/discourse/services/search.js.es6 +++ b/app/assets/javascripts/discourse/services/search.js.es6 @@ -1,5 +1,4 @@ -import { get } from "@ember/object"; -import EmberObject from "@ember/object"; +import EmberObject, { get } from "@ember/object"; import discourseComputed, { observes } from "discourse-common/utils/decorators"; export default EmberObject.extend({ diff --git a/app/assets/javascripts/discourse/widgets/glue.js.es6 b/app/assets/javascripts/discourse/widgets/glue.js.es6 index 7d8a2a45614..2fe75def260 100644 --- a/app/assets/javascripts/discourse/widgets/glue.js.es6 +++ b/app/assets/javascripts/discourse/widgets/glue.js.es6 @@ -1,5 +1,4 @@ -import { cancel } from "@ember/runloop"; -import { scheduleOnce } from "@ember/runloop"; +import { cancel, scheduleOnce } from "@ember/runloop"; import { diff, patch } from "virtual-dom"; import { queryRegistry } from "discourse/widgets/widget"; import DirtyKeys from "discourse/lib/dirty-keys"; diff --git a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 b/app/assets/javascripts/discourse/widgets/post-menu.js.es6 index c833d8edf97..b5562aa2f1a 100644 --- a/app/assets/javascripts/discourse/widgets/post-menu.js.es6 +++ b/app/assets/javascripts/discourse/widgets/post-menu.js.es6 @@ -1,5 +1,4 @@ -import { run } from "@ember/runloop"; -import { next } from "@ember/runloop"; +import { next, run } from "@ember/runloop"; import { applyDecorators, createWidget } from "discourse/widgets/widget"; import { avatarAtts } from "discourse/widgets/actions-summary"; import { h } from "virtual-dom"; diff --git a/app/assets/javascripts/discourse/widgets/search-menu.js.es6 b/app/assets/javascripts/discourse/widgets/search-menu.js.es6 index 5c3b3e08b1f..690dc80bffa 100644 --- a/app/assets/javascripts/discourse/widgets/search-menu.js.es6 +++ b/app/assets/javascripts/discourse/widgets/search-menu.js.es6 @@ -1,6 +1,5 @@ import { get } from "@ember/object"; -import { debounce } from "@ember/runloop"; -import { later } from "@ember/runloop"; +import { debounce, later } from "@ember/runloop"; import { popupAjaxError } from "discourse/lib/ajax-error"; import { searchForTerm, isValidSearchTerm } from "discourse/lib/search"; import { createWidget } from "discourse/widgets/widget"; diff --git a/app/assets/javascripts/select-kit/components/select-kit.js.es6 b/app/assets/javascripts/select-kit/components/select-kit.js.es6 index 9c9d5424319..25aa3e68e76 100644 --- a/app/assets/javascripts/select-kit/components/select-kit.js.es6 +++ b/app/assets/javascripts/select-kit/components/select-kit.js.es6 @@ -1,8 +1,7 @@ -import { computed, guidFor, default as EmberObject } from "@ember/object"; +import EmberObject, { computed, get, guidFor } from "@ember/object"; import Component from "@ember/component"; import deprecated from "discourse-common/lib/deprecated"; import { makeArray } from "discourse-common/lib/helpers"; -import { get } from "@ember/object"; import UtilsMixin from "select-kit/mixins/utils"; import PluginApiMixin from "select-kit/mixins/plugin-api"; import Mixin from "@ember/object/mixin"; diff --git a/app/assets/javascripts/select-kit/components/selected-name.js.es6 b/app/assets/javascripts/select-kit/components/selected-name.js.es6 index 1f69a5e2eee..ac23c16446d 100644 --- a/app/assets/javascripts/select-kit/components/selected-name.js.es6 +++ b/app/assets/javascripts/select-kit/components/selected-name.js.es6 @@ -1,8 +1,7 @@ -import { computed } from "@ember/object"; +import { computed, get } from "@ember/object"; import Component from "@ember/component"; import { makeArray } from "discourse-common/lib/helpers"; import UtilsMixin from "select-kit/mixins/utils"; -import { get } from "@ember/object"; export default Component.extend(UtilsMixin, { layoutName: "select-kit/templates/components/selected-name", diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 index 175f3a99852..1e782973760 100644 --- a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 +++ b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6 @@ -1,6 +1,4 @@ -import { once } from "@ember/runloop"; -import { debounce } from "@ember/runloop"; -import { cancel } from "@ember/runloop"; +import { cancel, debounce, once } from "@ember/runloop"; import Component from "@ember/component"; import { equal, gt } from "@ember/object/computed"; import { Promise } from "rsvp"; diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6 b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6 index c12573803d5..1089246fb65 100644 --- a/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6 +++ b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6 @@ -1,5 +1,4 @@ -import { debounce } from "@ember/runloop"; -import { cancel } from "@ember/runloop"; +import { cancel, debounce } from "@ember/runloop"; import Component from "@ember/component"; import { gt } from "@ember/object/computed"; import computed, { on } from "discourse-common/utils/decorators";