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

FIX: Move makeArray to discourse-common

Browse Source
This commit is contained in:
Robin Ward
2019-11-01 13:06:50 -04:00
parent 6300ac699a
commit dceb72bc69
17 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
import { makeArray } from "discourse/lib/utilities"; import { makeArray } from "discourse-common/lib/helpers";
import { debounce } from "@ember/runloop"; import { debounce } from "@ember/runloop";
import { schedule } from "@ember/runloop"; import { schedule } from "@ember/runloop";
import Component from "@ember/component"; import Component from "@ember/component";

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

@ -1,4 +1,4 @@
import { makeArray } from "discourse/lib/utilities"; import { makeArray } from "discourse-common/lib/helpers";
import { debounce } from "@ember/runloop"; import { debounce } from "@ember/runloop";
import { schedule } from "@ember/runloop"; import { schedule } from "@ember/runloop";
import Component from "@ember/component"; import Component from "@ember/component";

2
app/assets/javascripts/admin/components/admin-report-table.js.es6
View File

@ -1,4 +1,4 @@
import { makeArray } from "discourse/lib/utilities"; import { makeArray } from "discourse-common/lib/helpers";
import { alias } from "@ember/object/computed"; import { alias } from "@ember/object/computed";
import Component from "@ember/component"; import Component from "@ember/component";
import computed from "ember-addons/ember-computed-decorators"; import computed from "ember-addons/ember-computed-decorators";

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

@ -1,4 +1,4 @@
import { makeArray } from "discourse/lib/utilities"; import { makeArray } from "discourse-common/lib/helpers";
import { alias, or, and, reads, equal, notEmpty } from "@ember/object/computed"; import { alias, or, and, reads, equal, notEmpty } from "@ember/object/computed";
import EmberObject from "@ember/object"; import EmberObject from "@ember/object";
import { next } from "@ember/runloop"; import { next } from "@ember/runloop";

2
app/assets/javascripts/admin/components/value-list.js.es6
View File

@ -1,4 +1,4 @@
import { makeArray } from "discourse/lib/utilities"; import { makeArray } from "discourse-common/lib/helpers";
import { empty, alias } from "@ember/object/computed"; import { empty, alias } from "@ember/object/computed";
import Component from "@ember/component"; import Component from "@ember/component";
import { on } from "ember-addons/ember-computed-decorators"; import { on } from "ember-addons/ember-computed-decorators";

2
app/assets/javascripts/admin/controllers/admin-customize-themes-show.js.es6
View File

@ -1,4 +1,4 @@
import { makeArray } from "discourse/lib/utilities"; import { makeArray } from "discourse-common/lib/helpers";
import { empty, notEmpty, match } from "@ember/object/computed"; import { empty, notEmpty, match } from "@ember/object/computed";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import { default as computed } from "ember-addons/ember-computed-decorators"; import { default as computed } from "ember-addons/ember-computed-decorators";

2
app/assets/javascripts/admin/controllers/admin-dashboard-general.js.es6
View File

@ -1,4 +1,4 @@
import { makeArray } from "discourse/lib/utilities"; import { makeArray } from "discourse-common/lib/helpers";
import { inject } from "@ember/controller"; import { inject } from "@ember/controller";
import Controller from "@ember/controller"; import Controller from "@ember/controller";
import { setting } from "discourse/lib/computed"; import { setting } from "discourse/lib/computed";

2
app/assets/javascripts/admin/models/report.js.es6
View File

@ -1,4 +1,4 @@
import { makeArray } from "discourse/lib/utilities"; import { makeArray } from "discourse-common/lib/helpers";
import { isEmpty } from "@ember/utils"; import { isEmpty } from "@ember/utils";
import EmberObject from "@ember/object"; import EmberObject from "@ember/object";
import { escapeExpression } from "discourse/lib/utilities"; import { escapeExpression } from "discourse/lib/utilities";

7
app/assets/javascripts/discourse-common/lib/helpers.js.es6
View File

@ -1,5 +1,12 @@
import { get } from "@ember/object"; import { get } from "@ember/object";
export function makeArray(obj) {
if (obj === null || obj === undefined) {
return [];
}
return Array.isArray(obj) ? obj : [obj];
}
export function htmlHelper(fn) { export function htmlHelper(fn) {
return Ember.Helper.helper(function(...args) { return Ember.Helper.helper(function(...args) {
args = args =

7
app/assets/javascripts/discourse/lib/utilities.js.es6
View File

@ -3,13 +3,6 @@ import toMarkdown from "discourse/lib/to-markdown";
const homepageSelector = "meta[name=discourse_current_homepage]"; const homepageSelector = "meta[name=discourse_current_homepage]";
export function makeArray(obj) {
if (obj === null || obj === undefined) {
return [];
}
return Array.isArray(obj) ? obj : [obj];
}
export function translateSize(size) { export function translateSize(size) {
switch (size) { switch (size) {
case "tiny": case "tiny":

2
app/assets/javascripts/discourse/widgets/private-message-map.js.es6
View File

@ -1,4 +1,4 @@
import { makeArray } from "discourse/lib/utilities"; import { makeArray } from "discourse-common/lib/helpers";
import { createWidget } from "discourse/widgets/widget"; import { createWidget } from "discourse/widgets/widget";
import { h } from "virtual-dom"; import { h } from "virtual-dom";
import { avatarFor, avatarImg } from "discourse/widgets/post"; import { avatarFor, avatarImg } from "discourse/widgets/post";

2
app/assets/javascripts/select-kit/components/category-selector.js.es6
View File

@ -1,5 +1,5 @@
import { get } from "@ember/object"; import { get } from "@ember/object";
import { makeArray } from "discourse/lib/utilities"; import { makeArray } from "discourse-common/lib/helpers";
import MultiSelectComponent from "select-kit/components/multi-select"; import MultiSelectComponent from "select-kit/components/multi-select";
import Category from "discourse/models/category"; import Category from "discourse/models/category";

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

@ -3,7 +3,8 @@ import ComboBox from "select-kit/components/combo-box";
import TagsMixin from "select-kit/mixins/tags"; import TagsMixin from "select-kit/mixins/tags";
import { default as computed } from "ember-addons/ember-computed-decorators"; import { default as computed } from "ember-addons/ember-computed-decorators";
import renderTag from "discourse/lib/render-tag"; import renderTag from "discourse/lib/render-tag";
import { escapeExpression, makeArray } from "discourse/lib/utilities"; import { escapeExpression } from "discourse/lib/utilities";
import { makeArray } from "discourse-common/lib/helpers";
import { iconHTML } from "discourse-common/lib/icon-library"; import { iconHTML } from "discourse-common/lib/icon-library";
import { get } from "@ember/object"; import { get } from "@ember/object";
import { isEmpty } from "@ember/utils"; import { isEmpty } from "@ember/utils";

2
app/assets/javascripts/select-kit/components/multi-select/multi-select-header.js.es6
View File

@ -1,4 +1,4 @@
import { makeArray } from "discourse/lib/utilities"; import { makeArray } from "discourse-common/lib/helpers";
import { on } from "ember-addons/ember-computed-decorators"; import { on } from "ember-addons/ember-computed-decorators";
import computed from "ember-addons/ember-computed-decorators"; import computed from "ember-addons/ember-computed-decorators";
import SelectKitHeaderComponent from "select-kit/components/select-kit/select-kit-header"; import SelectKitHeaderComponent from "select-kit/components/select-kit/select-kit-header";

2
app/assets/javascripts/select-kit/components/tag-chooser.js.es6
View File

@ -2,7 +2,7 @@ import MultiSelectComponent from "select-kit/components/multi-select";
import TagsMixin from "select-kit/mixins/tags"; import TagsMixin from "select-kit/mixins/tags";
import renderTag from "discourse/lib/render-tag"; import renderTag from "discourse/lib/render-tag";
import computed from "ember-addons/ember-computed-decorators"; import computed from "ember-addons/ember-computed-decorators";
import { makeArray } from "discourse/lib/utilities"; import { makeArray } from "discourse-common/lib/helpers";
const { get, run } = Ember; const { get, run } = Ember;
export default MultiSelectComponent.extend(TagsMixin, { export default MultiSelectComponent.extend(TagsMixin, {

2
app/assets/javascripts/select-kit/components/tag-drop.js.es6
View File

@ -1,4 +1,4 @@
import { makeArray } from "discourse/lib/utilities"; import { makeArray } from "discourse-common/lib/helpers";
import ComboBoxComponent from "select-kit/components/combo-box"; import ComboBoxComponent from "select-kit/components/combo-box";
import DiscourseURL from "discourse/lib/url"; import DiscourseURL from "discourse/lib/url";
import TagsMixin from "select-kit/mixins/tags"; import TagsMixin from "select-kit/mixins/tags";

2
app/assets/javascripts/select-kit/mixins/events.js.es6
View File

@ -1,5 +1,5 @@
import { get } from "@ember/object"; import { get } from "@ember/object";
import { makeArray } from "discourse/lib/utilities"; import { makeArray } from "discourse-common/lib/helpers";
import { isEmpty } from "@ember/utils"; import { isEmpty } from "@ember/utils";
import { throttle } from "@ember/runloop"; import { throttle } from "@ember/runloop";
import { schedule } from "@ember/runloop"; import { schedule } from "@ember/runloop";