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

Merge imports from the same module (#9144)

Browse Source
This commit is contained in:
Jarek Radosz 2020-03-09 17:38:37 +01:00 committed by GitHub
parent e35bc8bebd
commit 5037b80c9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
43 changed files with 44 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/admin/components/admin-report-chart.js.es6
View File

@ -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";

3
app/assets/javascripts/admin/components/admin-report-stacked-chart.js.es6
View File

@ -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";

3
app/assets/javascripts/admin/components/resumable-upload.js.es6
View File

@ -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";

6
app/assets/javascripts/discourse/components/composer-editor.js.es6
View File

@ -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, {

4
app/assets/javascripts/discourse/components/composer-title.js.es6
View File

@ -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";

6
app/assets/javascripts/discourse/components/d-editor.js.es6
View File

@ -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 */

5
app/assets/javascripts/discourse/components/discourse-topic.js.es6
View File

@ -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";

3
app/assets/javascripts/discourse/components/discovery-topics-list.js.es6
View File

@ -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";

3
app/assets/javascripts/discourse/components/global-notice.js.es6
View File

@ -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 = [];

3
app/assets/javascripts/discourse/components/invite-panel.js.es6
View File

@ -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";

3
app/assets/javascripts/discourse/components/mount-widget.js.es6
View File

@ -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";

4
app/assets/javascripts/discourse/components/scrolling-post-stream.js.es6
View File

@ -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";

3
app/assets/javascripts/discourse/components/search-advanced-options.js.es6
View File

@ -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";

3
app/assets/javascripts/discourse/components/share-popup.js.es6
View File

@ -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";

4
app/assets/javascripts/discourse/components/site-header.js.es6
View File

@ -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";

3
app/assets/javascripts/discourse/components/suggested-topics.js.es6
View File

@ -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",

3
app/assets/javascripts/discourse/components/topic-timer-info.js.es6
View File

@ -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";

3
app/assets/javascripts/discourse/components/user-card-contents.js.es6
View File

@ -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, {

3
app/assets/javascripts/discourse/controllers/edit-topic-timer.js.es6
View File

@ -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";

4
app/assets/javascripts/discourse/controllers/insert-hyperlink.js.es6
View File

@ -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";

3
app/assets/javascripts/discourse/controllers/user.js.es6
View File

@ -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,

3
app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
View File

@ -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 {

3
app/assets/javascripts/discourse/lib/autocomplete.js.es6
View File

@ -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";

3
app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
View File

@ -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";

3
app/assets/javascripts/discourse/lib/url.js.es6
View File

@ -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";

4
app/assets/javascripts/discourse/mixins/card-contents-base.js.es6
View File

@ -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";

8
app/assets/javascripts/discourse/models/composer.js.es6
View File

@ -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";

3
app/assets/javascripts/discourse/models/post.js.es6
View File

@ -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";

3
app/assets/javascripts/discourse/models/site.js.es6
View File

@ -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";

3
app/assets/javascripts/discourse/models/store.js.es6
View File

@ -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";

3
app/assets/javascripts/discourse/models/topic-tracking-state.js.es6
View File

@ -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) {

3
app/assets/javascripts/discourse/models/topic.js.es6
View File

@ -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";

3
app/assets/javascripts/discourse/models/user.js.es6
View File

@ -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";

3
app/assets/javascripts/discourse/routes/application.js.es6
View File

@ -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";

4
app/assets/javascripts/discourse/routes/topic.js.es6
View File

@ -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";

3
app/assets/javascripts/discourse/services/search.js.es6
View File

@ -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({

3
app/assets/javascripts/discourse/widgets/glue.js.es6
View File

@ -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";

3
app/assets/javascripts/discourse/widgets/post-menu.js.es6
View File

@ -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";

3
app/assets/javascripts/discourse/widgets/search-menu.js.es6
View File

@ -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";

3
app/assets/javascripts/select-kit/components/select-kit.js.es6
View File

@ -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";

3
app/assets/javascripts/select-kit/components/selected-name.js.es6
View File

@ -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",

4
plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.js.es6
View File

@ -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";

3
plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.js.es6
View File

@ -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";