From edc15d3163502d9b55475c6367c9605930c8d8f3 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Tue, 29 Mar 2016 22:32:15 +0900 Subject: [PATCH] Remove unused mixin imports --- framework/core/js/admin/dist/app.js | 36 +++++++------------- framework/core/js/forum/dist/app.js | 36 +++++++------------- framework/core/js/lib/models/Discussion.js | 1 - framework/core/js/lib/models/Forum.js | 1 - framework/core/js/lib/models/Group.js | 1 - framework/core/js/lib/models/Notification.js | 1 - framework/core/js/lib/models/Post.js | 1 - framework/core/js/lib/models/User.js | 1 - 8 files changed, 24 insertions(+), 54 deletions(-) diff --git a/framework/core/js/admin/dist/app.js b/framework/core/js/admin/dist/app.js index 0bef0c2f7..52315a9ff 100644 --- a/framework/core/js/admin/dist/app.js +++ b/framework/core/js/admin/dist/app.js @@ -21239,13 +21239,11 @@ System.register('flarum/Model', [], function (_export, _context) { });; 'use strict'; -System.register('flarum/models/Discussion', ['flarum/Model', 'flarum/utils/mixin', 'flarum/utils/computed', 'flarum/utils/ItemList', 'flarum/components/Badge'], function (_export, _context) { - var Model, mixin, computed, ItemList, Badge, Discussion; +System.register('flarum/models/Discussion', ['flarum/Model', 'flarum/utils/computed', 'flarum/utils/ItemList', 'flarum/components/Badge'], function (_export, _context) { + var Model, computed, ItemList, Badge, Discussion; return { setters: [function (_flarumModel) { Model = _flarumModel.default; - }, function (_flarumUtilsMixin) { - mixin = _flarumUtilsMixin.default; }, function (_flarumUtilsComputed) { computed = _flarumUtilsComputed.default; }, function (_flarumUtilsItemList) { @@ -21353,13 +21351,11 @@ System.register('flarum/models/Discussion', ['flarum/Model', 'flarum/utils/mixin });; 'use strict'; -System.register('flarum/models/Forum', ['flarum/Model', 'flarum/utils/mixin'], function (_export, _context) { - var Model, mixin, Forum; +System.register('flarum/models/Forum', ['flarum/Model'], function (_export, _context) { + var Model, Forum; return { setters: [function (_flarumModel) { Model = _flarumModel.default; - }, function (_flarumUtilsMixin) { - mixin = _flarumUtilsMixin.default; }], execute: function () { Forum = function (_Model) { @@ -21385,13 +21381,11 @@ System.register('flarum/models/Forum', ['flarum/Model', 'flarum/utils/mixin'], f });; 'use strict'; -System.register('flarum/models/Group', ['flarum/Model', 'flarum/utils/mixin'], function (_export, _context) { - var Model, mixin, Group; +System.register('flarum/models/Group', ['flarum/Model'], function (_export, _context) { + var Model, Group; return { setters: [function (_flarumModel) { Model = _flarumModel.default; - }, function (_flarumUtilsMixin) { - mixin = _flarumUtilsMixin.default; }], execute: function () { Group = function (_Model) { @@ -21422,13 +21416,11 @@ System.register('flarum/models/Group', ['flarum/Model', 'flarum/utils/mixin'], f });; 'use strict'; -System.register('flarum/models/Notification', ['flarum/Model', 'flarum/utils/mixin', 'flarum/utils/computed'], function (_export, _context) { - var Model, mixin, computed, Notification; +System.register('flarum/models/Notification', ['flarum/Model', 'flarum/utils/computed'], function (_export, _context) { + var Model, computed, Notification; return { setters: [function (_flarumModel) { Model = _flarumModel.default; - }, function (_flarumUtilsMixin) { - mixin = _flarumUtilsMixin.default; }, function (_flarumUtilsComputed) { computed = _flarumUtilsComputed.default; }], @@ -21469,13 +21461,11 @@ System.register('flarum/models/Notification', ['flarum/Model', 'flarum/utils/mix });; 'use strict'; -System.register('flarum/models/Post', ['flarum/Model', 'flarum/utils/mixin', 'flarum/utils/computed', 'flarum/utils/string'], function (_export, _context) { - var Model, mixin, computed, getPlainContent, Post; +System.register('flarum/models/Post', ['flarum/Model', 'flarum/utils/computed', 'flarum/utils/string'], function (_export, _context) { + var Model, computed, getPlainContent, Post; return { setters: [function (_flarumModel) { Model = _flarumModel.default; - }, function (_flarumUtilsMixin) { - mixin = _flarumUtilsMixin.default; }, function (_flarumUtilsComputed) { computed = _flarumUtilsComputed.default; }, function (_flarumUtilsString) { @@ -21528,13 +21518,11 @@ System.register('flarum/models/Post', ['flarum/Model', 'flarum/utils/mixin', 'fl });; 'use strict'; -System.register('flarum/models/User', ['flarum/Model', 'flarum/utils/mixin', 'flarum/utils/stringToColor', 'flarum/utils/ItemList', 'flarum/utils/computed', 'flarum/components/GroupBadge'], function (_export, _context) { - var Model, mixin, stringToColor, ItemList, computed, GroupBadge, User; +System.register('flarum/models/User', ['flarum/Model', 'flarum/utils/stringToColor', 'flarum/utils/ItemList', 'flarum/utils/computed', 'flarum/components/GroupBadge'], function (_export, _context) { + var Model, stringToColor, ItemList, computed, GroupBadge, User; return { setters: [function (_flarumModel) { Model = _flarumModel.default; - }, function (_flarumUtilsMixin) { - mixin = _flarumUtilsMixin.default; }, function (_flarumUtilsStringToColor) { stringToColor = _flarumUtilsStringToColor.default; }, function (_flarumUtilsItemList) { diff --git a/framework/core/js/forum/dist/app.js b/framework/core/js/forum/dist/app.js index 4bc4b4549..cb908588c 100644 --- a/framework/core/js/forum/dist/app.js +++ b/framework/core/js/forum/dist/app.js @@ -29019,13 +29019,11 @@ System.register('flarum/Model', [], function (_export, _context) { });; 'use strict'; -System.register('flarum/models/Discussion', ['flarum/Model', 'flarum/utils/mixin', 'flarum/utils/computed', 'flarum/utils/ItemList', 'flarum/components/Badge'], function (_export, _context) { - var Model, mixin, computed, ItemList, Badge, Discussion; +System.register('flarum/models/Discussion', ['flarum/Model', 'flarum/utils/computed', 'flarum/utils/ItemList', 'flarum/components/Badge'], function (_export, _context) { + var Model, computed, ItemList, Badge, Discussion; return { setters: [function (_flarumModel) { Model = _flarumModel.default; - }, function (_flarumUtilsMixin) { - mixin = _flarumUtilsMixin.default; }, function (_flarumUtilsComputed) { computed = _flarumUtilsComputed.default; }, function (_flarumUtilsItemList) { @@ -29133,13 +29131,11 @@ System.register('flarum/models/Discussion', ['flarum/Model', 'flarum/utils/mixin });; 'use strict'; -System.register('flarum/models/Forum', ['flarum/Model', 'flarum/utils/mixin'], function (_export, _context) { - var Model, mixin, Forum; +System.register('flarum/models/Forum', ['flarum/Model'], function (_export, _context) { + var Model, Forum; return { setters: [function (_flarumModel) { Model = _flarumModel.default; - }, function (_flarumUtilsMixin) { - mixin = _flarumUtilsMixin.default; }], execute: function () { Forum = function (_Model) { @@ -29165,13 +29161,11 @@ System.register('flarum/models/Forum', ['flarum/Model', 'flarum/utils/mixin'], f });; 'use strict'; -System.register('flarum/models/Group', ['flarum/Model', 'flarum/utils/mixin'], function (_export, _context) { - var Model, mixin, Group; +System.register('flarum/models/Group', ['flarum/Model'], function (_export, _context) { + var Model, Group; return { setters: [function (_flarumModel) { Model = _flarumModel.default; - }, function (_flarumUtilsMixin) { - mixin = _flarumUtilsMixin.default; }], execute: function () { Group = function (_Model) { @@ -29202,13 +29196,11 @@ System.register('flarum/models/Group', ['flarum/Model', 'flarum/utils/mixin'], f });; 'use strict'; -System.register('flarum/models/Notification', ['flarum/Model', 'flarum/utils/mixin', 'flarum/utils/computed'], function (_export, _context) { - var Model, mixin, computed, Notification; +System.register('flarum/models/Notification', ['flarum/Model', 'flarum/utils/computed'], function (_export, _context) { + var Model, computed, Notification; return { setters: [function (_flarumModel) { Model = _flarumModel.default; - }, function (_flarumUtilsMixin) { - mixin = _flarumUtilsMixin.default; }, function (_flarumUtilsComputed) { computed = _flarumUtilsComputed.default; }], @@ -29249,13 +29241,11 @@ System.register('flarum/models/Notification', ['flarum/Model', 'flarum/utils/mix });; 'use strict'; -System.register('flarum/models/Post', ['flarum/Model', 'flarum/utils/mixin', 'flarum/utils/computed', 'flarum/utils/string'], function (_export, _context) { - var Model, mixin, computed, getPlainContent, Post; +System.register('flarum/models/Post', ['flarum/Model', 'flarum/utils/computed', 'flarum/utils/string'], function (_export, _context) { + var Model, computed, getPlainContent, Post; return { setters: [function (_flarumModel) { Model = _flarumModel.default; - }, function (_flarumUtilsMixin) { - mixin = _flarumUtilsMixin.default; }, function (_flarumUtilsComputed) { computed = _flarumUtilsComputed.default; }, function (_flarumUtilsString) { @@ -29308,13 +29298,11 @@ System.register('flarum/models/Post', ['flarum/Model', 'flarum/utils/mixin', 'fl });; 'use strict'; -System.register('flarum/models/User', ['flarum/Model', 'flarum/utils/mixin', 'flarum/utils/stringToColor', 'flarum/utils/ItemList', 'flarum/utils/computed', 'flarum/components/GroupBadge'], function (_export, _context) { - var Model, mixin, stringToColor, ItemList, computed, GroupBadge, User; +System.register('flarum/models/User', ['flarum/Model', 'flarum/utils/stringToColor', 'flarum/utils/ItemList', 'flarum/utils/computed', 'flarum/components/GroupBadge'], function (_export, _context) { + var Model, stringToColor, ItemList, computed, GroupBadge, User; return { setters: [function (_flarumModel) { Model = _flarumModel.default; - }, function (_flarumUtilsMixin) { - mixin = _flarumUtilsMixin.default; }, function (_flarumUtilsStringToColor) { stringToColor = _flarumUtilsStringToColor.default; }, function (_flarumUtilsItemList) { diff --git a/framework/core/js/lib/models/Discussion.js b/framework/core/js/lib/models/Discussion.js index d4c6c0ee6..cbfad1ac3 100644 --- a/framework/core/js/lib/models/Discussion.js +++ b/framework/core/js/lib/models/Discussion.js @@ -1,5 +1,4 @@ import Model from 'flarum/Model'; -import mixin from 'flarum/utils/mixin'; import computed from 'flarum/utils/computed'; import ItemList from 'flarum/utils/ItemList'; import Badge from 'flarum/components/Badge'; diff --git a/framework/core/js/lib/models/Forum.js b/framework/core/js/lib/models/Forum.js index 00e0119db..2898b170b 100644 --- a/framework/core/js/lib/models/Forum.js +++ b/framework/core/js/lib/models/Forum.js @@ -1,5 +1,4 @@ import Model from 'flarum/Model'; -import mixin from 'flarum/utils/mixin'; export default class Forum extends Model { apiEndpoint() { diff --git a/framework/core/js/lib/models/Group.js b/framework/core/js/lib/models/Group.js index 1a1a6c645..82dc0f9f0 100644 --- a/framework/core/js/lib/models/Group.js +++ b/framework/core/js/lib/models/Group.js @@ -1,5 +1,4 @@ import Model from 'flarum/Model'; -import mixin from 'flarum/utils/mixin'; class Group extends Model {} diff --git a/framework/core/js/lib/models/Notification.js b/framework/core/js/lib/models/Notification.js index 7a03acbc7..ebada7ef3 100644 --- a/framework/core/js/lib/models/Notification.js +++ b/framework/core/js/lib/models/Notification.js @@ -1,5 +1,4 @@ import Model from 'flarum/Model'; -import mixin from 'flarum/utils/mixin'; import computed from 'flarum/utils/computed'; export default class Notification extends Model {} diff --git a/framework/core/js/lib/models/Post.js b/framework/core/js/lib/models/Post.js index 43b6d5156..242d2a414 100644 --- a/framework/core/js/lib/models/Post.js +++ b/framework/core/js/lib/models/Post.js @@ -1,5 +1,4 @@ import Model from 'flarum/Model'; -import mixin from 'flarum/utils/mixin'; import computed from 'flarum/utils/computed'; import { getPlainContent } from 'flarum/utils/string'; diff --git a/framework/core/js/lib/models/User.js b/framework/core/js/lib/models/User.js index cd7ead7be..562206532 100644 --- a/framework/core/js/lib/models/User.js +++ b/framework/core/js/lib/models/User.js @@ -1,7 +1,6 @@ /*global ColorThief*/ import Model from 'flarum/Model'; -import mixin from 'flarum/utils/mixin'; import stringToColor from 'flarum/utils/stringToColor'; import ItemList from 'flarum/utils/ItemList'; import computed from 'flarum/utils/computed';