github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-02 11:53:40 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: allows to import isPresent (#8993)

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2020-02-18 23:41:15 +01:00 committed by GitHub
parent 8f82d790d4
commit 25ebfd5998
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/discourse-loader.js
View File

@ -80,6 +80,7 @@ var define, requirejs;
inject: Ember.inject.service inject: Ember.inject.service
}, },
"@ember/utils": { "@ember/utils": {
isPresent: Ember.isPresent,
isEmpty: Ember.isEmpty, isEmpty: Ember.isEmpty,
isNone: Ember.isNone isNone: Ember.isNone
}, },

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

@ -1,4 +1,4 @@
import { isEmpty } from "@ember/utils"; import { isPresent, isEmpty } from "@ember/utils";
import { or, and, not, alias } from "@ember/object/computed"; import { or, and, not, alias } from "@ember/object/computed";
import EmberObject from "@ember/object"; import EmberObject from "@ember/object";
import { next } from "@ember/runloop"; import { next } from "@ember/runloop";
@ -1299,7 +1299,7 @@ export default Controller.extend(bufferedProperty("model"), {
data => { data => {
const topic = this.model; const topic = this.model;
if (Ember.isPresent(data.notification_level_change)) { if (isPresent(data.notification_level_change)) {
topic.set( topic.set(
"details.notification_level", "details.notification_level",
data.notification_level_change data.notification_level_change

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

@ -2,6 +2,7 @@ import deprecated from "discourse-common/lib/deprecated";
import SelectKitComponent from "select-kit/components/select-kit"; import SelectKitComponent from "select-kit/components/select-kit";
import { computed } from "@ember/object"; import { computed } from "@ember/object";
import { makeArray } from "discourse-common/lib/helpers"; import { makeArray } from "discourse-common/lib/helpers";
import { isPresent } from "@ember/utils";
export default SelectKitComponent.extend({ export default SelectKitComponent.extend({
pluginApiIdentifiers: ["multi-select"], pluginApiIdentifiers: ["multi-select"],
@ -41,7 +42,7 @@ export default SelectKitComponent.extend({
}, },
select(value, item) { select(value, item) {
if (!Ember.isPresent(value)) { if (!isPresent(value)) {
if (!this.validateSelect(this.selectKit.highlighted)) { if (!this.validateSelect(this.selectKit.highlighted)) {
return; return;
} }

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

@ -6,7 +6,7 @@ import { get } from "@ember/object";
import UtilsMixin from "select-kit/mixins/utils"; import UtilsMixin from "select-kit/mixins/utils";
import PluginApiMixin from "select-kit/mixins/plugin-api"; import PluginApiMixin from "select-kit/mixins/plugin-api";
import Mixin from "@ember/object/mixin"; import Mixin from "@ember/object/mixin";
import { isEmpty, isNone } from "@ember/utils"; import { isPresent, isEmpty, isNone } from "@ember/utils";
import { import {
next, next,
debounce, debounce,
@ -422,8 +422,8 @@ export default Component.extend(
} }
if (this.singleSelect) { if (this.singleSelect) {
value = Ember.isPresent(value.firstObject) ? value.firstObject : null; value = isPresent(value.firstObject) ? value.firstObject : null;
items = Ember.isPresent(items.firstObject) ? items.firstObject : null; items = isPresent(items.firstObject) ? items.firstObject : null;
} }
this._boundaryActionHandler("onChange", value, items); this._boundaryActionHandler("onChange", value, items);
@ -704,7 +704,7 @@ export default Component.extend(
}, },
select(value, item) { select(value, item) {
if (!Ember.isPresent(value)) { if (!isPresent(value)) {
if (!this.validateSelect(this.selectKit.highlighted)) { if (!this.validateSelect(this.selectKit.highlighted)) {
return; return;
} }