IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Remove Ember.Mixin to import @ember/object/mixin (#8269)

Browse Source
This commit is contained in:
Mark VanLandingham
2019-10-30 14:03:08 -05:00
committed by Robin Ward
parent e7eeb7c47f
commit ba4b557114
32 changed files with 68 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/admin/mixins/penalty-controller.js.es6
View File

@@ -1,7 +1,8 @@
import ModalFunctionality from "discourse/mixins/modal-functionality";
import { popupAjaxError } from "discourse/lib/ajax-error";
import Mixin from '@ember/object/mixin';
export default Ember.Mixin.create(ModalFunctionality, {
export default Mixin.create(ModalFunctionality, {
reason: null,
message: null,
postEdit: null,

3
app/assets/javascripts/admin/mixins/period-computation.js.es6
View File

@@ -1,7 +1,8 @@
import DiscourseURL from "discourse/lib/url";
import computed from "ember-addons/ember-computed-decorators";
import Mixin from '@ember/object/mixin';
export default Ember.Mixin.create({
export default Mixin.create({
queryParams: ["period"],
period: "monthly",

3
app/assets/javascripts/admin/mixins/setting-component.js.es6
View File

@@ -1,5 +1,6 @@
import computed from "ember-addons/ember-computed-decorators";
import { categoryLinkHTML } from "discourse/helpers/category-link";
import Mixin from '@ember/object/mixin';
const CUSTOM_TYPES = [
"bool",
@@ -19,7 +20,7 @@ const CUSTOM_TYPES = [
const AUTO_REFRESH_ON_SAVE = ["logo", "logo_small", "large_icon"];
export default Ember.Mixin.create({
export default Mixin.create({
classNameBindings: [":row", ":setting", "overridden", "typeClass"],
content: Ember.computed.alias("setting"),
validationMessage: null,

3
app/assets/javascripts/admin/mixins/setting-object.js.es6
View File

@@ -1,6 +1,7 @@
import computed from "ember-addons/ember-computed-decorators";
import Mixin from '@ember/object/mixin';
export default Ember.Mixin.create({
export default Mixin.create({
@computed("value", "default")
overridden(val, defaultVal) {
if (val === null) val = "";