From 06008cf2e13bf65bfa99abd2bfd00b66cf44366f Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Fri, 18 Mar 2016 09:33:05 +1030 Subject: [PATCH] Upgrade to flarum-gulp 0.2.0 / Babel 6 --- extensions/lock/js/admin/dist/extension.js | 8 +-- extensions/lock/js/admin/package.json | 4 +- extensions/lock/js/forum/dist/extension.js | 72 +++++++++++----------- extensions/lock/js/forum/package.json | 4 +- 4 files changed, 43 insertions(+), 45 deletions(-) diff --git a/extensions/lock/js/admin/dist/extension.js b/extensions/lock/js/admin/dist/extension.js index 12a2dd622..906298552 100644 --- a/extensions/lock/js/admin/dist/extension.js +++ b/extensions/lock/js/admin/dist/extension.js @@ -1,14 +1,14 @@ -System.register('flarum/lock/main', ['flarum/extend', 'flarum/app', 'flarum/components/PermissionGrid'], function (_export) { - 'use strict'; +'use strict'; +System.register('flarum/lock/main', ['flarum/extend', 'flarum/app', 'flarum/components/PermissionGrid'], function (_export, _context) { var extend, app, PermissionGrid; return { setters: [function (_flarumExtend) { extend = _flarumExtend.extend; }, function (_flarumApp) { - app = _flarumApp['default']; + app = _flarumApp.default; }, function (_flarumComponentsPermissionGrid) { - PermissionGrid = _flarumComponentsPermissionGrid['default']; + PermissionGrid = _flarumComponentsPermissionGrid.default; }], execute: function () { diff --git a/extensions/lock/js/admin/package.json b/extensions/lock/js/admin/package.json index 62ea6c691..19a7865d9 100644 --- a/extensions/lock/js/admin/package.json +++ b/extensions/lock/js/admin/package.json @@ -1,7 +1,7 @@ { "private": true, "devDependencies": { - "gulp": "^3.8.11", - "flarum-gulp": "^0.1.0" + "gulp": "^3.9.1", + "flarum-gulp": "^0.2.0" } } diff --git a/extensions/lock/js/forum/dist/extension.js b/extensions/lock/js/forum/dist/extension.js index 5a6ebee88..c8eb6b503 100644 --- a/extensions/lock/js/forum/dist/extension.js +++ b/extensions/lock/js/forum/dist/extension.js @@ -1,10 +1,7 @@ -System.register('flarum/lock/addLockBadge', ['flarum/extend', 'flarum/models/Discussion', 'flarum/components/Badge'], function (_export) { - 'use strict'; +'use strict'; +System.register('flarum/lock/addLockBadge', ['flarum/extend', 'flarum/models/Discussion', 'flarum/components/Badge'], function (_export, _context) { var extend, Discussion, Badge; - - _export('default', addLockBadge); - function addLockBadge() { extend(Discussion.prototype, 'badges', function (badges) { if (this.isLocked()) { @@ -17,24 +14,23 @@ System.register('flarum/lock/addLockBadge', ['flarum/extend', 'flarum/models/Dis }); } + _export('default', addLockBadge); + return { setters: [function (_flarumExtend) { extend = _flarumExtend.extend; }, function (_flarumModelsDiscussion) { - Discussion = _flarumModelsDiscussion['default']; + Discussion = _flarumModelsDiscussion.default; }, function (_flarumComponentsBadge) { - Badge = _flarumComponentsBadge['default']; + Badge = _flarumComponentsBadge.default; }], execute: function () {} }; });; -System.register('flarum/lock/addLockControl', ['flarum/extend', 'flarum/utils/DiscussionControls', 'flarum/components/DiscussionPage', 'flarum/components/Button'], function (_export) { - 'use strict'; +'use strict'; +System.register('flarum/lock/addLockControl', ['flarum/extend', 'flarum/utils/DiscussionControls', 'flarum/components/DiscussionPage', 'flarum/components/Button'], function (_export, _context) { var extend, DiscussionControls, DiscussionPage, Button; - - _export('default', addLockControl); - function addLockControl() { extend(DiscussionControls, 'moderationControls', function (items, discussion) { if (discussion.canLock()) { @@ -57,34 +53,36 @@ System.register('flarum/lock/addLockControl', ['flarum/extend', 'flarum/utils/Di }; } + _export('default', addLockControl); + return { setters: [function (_flarumExtend) { extend = _flarumExtend.extend; }, function (_flarumUtilsDiscussionControls) { - DiscussionControls = _flarumUtilsDiscussionControls['default']; + DiscussionControls = _flarumUtilsDiscussionControls.default; }, function (_flarumComponentsDiscussionPage) { - DiscussionPage = _flarumComponentsDiscussionPage['default']; + DiscussionPage = _flarumComponentsDiscussionPage.default; }, function (_flarumComponentsButton) { - Button = _flarumComponentsButton['default']; + Button = _flarumComponentsButton.default; }], execute: function () {} }; });; -System.register('flarum/lock/components/DiscussionLockedNotification', ['flarum/components/Notification'], function (_export) { - 'use strict'; +'use strict'; +System.register('flarum/lock/components/DiscussionLockedNotification', ['flarum/components/Notification'], function (_export, _context) { var Notification, DiscussionLockedNotification; return { setters: [function (_flarumComponentsNotification) { - Notification = _flarumComponentsNotification['default']; + Notification = _flarumComponentsNotification.default; }], execute: function () { - DiscussionLockedNotification = (function (_Notification) { + DiscussionLockedNotification = function (_Notification) { babelHelpers.inherits(DiscussionLockedNotification, _Notification); function DiscussionLockedNotification() { babelHelpers.classCallCheck(this, DiscussionLockedNotification); - babelHelpers.get(Object.getPrototypeOf(DiscussionLockedNotification.prototype), 'constructor', this).apply(this, arguments); + return babelHelpers.possibleConstructorReturn(this, Object.getPrototypeOf(DiscussionLockedNotification).apply(this, arguments)); } babelHelpers.createClass(DiscussionLockedNotification, [{ @@ -106,27 +104,27 @@ System.register('flarum/lock/components/DiscussionLockedNotification', ['flarum/ } }]); return DiscussionLockedNotification; - })(Notification); + }(Notification); _export('default', DiscussionLockedNotification); } }; });; -System.register('flarum/lock/components/DiscussionLockedPost', ['flarum/components/EventPost'], function (_export) { - 'use strict'; +'use strict'; +System.register('flarum/lock/components/DiscussionLockedPost', ['flarum/components/EventPost'], function (_export, _context) { var EventPost, DiscussionLockedPost; return { setters: [function (_flarumComponentsEventPost) { - EventPost = _flarumComponentsEventPost['default']; + EventPost = _flarumComponentsEventPost.default; }], execute: function () { - DiscussionLockedPost = (function (_EventPost) { + DiscussionLockedPost = function (_EventPost) { babelHelpers.inherits(DiscussionLockedPost, _EventPost); function DiscussionLockedPost() { babelHelpers.classCallCheck(this, DiscussionLockedPost); - babelHelpers.get(Object.getPrototypeOf(DiscussionLockedPost.prototype), 'constructor', this).apply(this, arguments); + return babelHelpers.possibleConstructorReturn(this, Object.getPrototypeOf(DiscussionLockedPost).apply(this, arguments)); } babelHelpers.createClass(DiscussionLockedPost, [{ @@ -141,35 +139,35 @@ System.register('flarum/lock/components/DiscussionLockedPost', ['flarum/componen } }]); return DiscussionLockedPost; - })(EventPost); + }(EventPost); _export('default', DiscussionLockedPost); } }; });; -System.register('flarum/lock/main', ['flarum/extend', 'flarum/app', 'flarum/Model', 'flarum/models/Discussion', 'flarum/components/NotificationGrid', 'flarum/lock/components/DiscussionLockedPost', 'flarum/lock/components/DiscussionLockedNotification', 'flarum/lock/addLockBadge', 'flarum/lock/addLockControl'], function (_export) { - 'use strict'; +'use strict'; +System.register('flarum/lock/main', ['flarum/extend', 'flarum/app', 'flarum/Model', 'flarum/models/Discussion', 'flarum/components/NotificationGrid', 'flarum/lock/components/DiscussionLockedPost', 'flarum/lock/components/DiscussionLockedNotification', 'flarum/lock/addLockBadge', 'flarum/lock/addLockControl'], function (_export, _context) { var extend, app, Model, Discussion, NotificationGrid, DiscussionLockedPost, DiscussionLockedNotification, addLockBadge, addLockControl; return { setters: [function (_flarumExtend) { extend = _flarumExtend.extend; }, function (_flarumApp) { - app = _flarumApp['default']; + app = _flarumApp.default; }, function (_flarumModel) { - Model = _flarumModel['default']; + Model = _flarumModel.default; }, function (_flarumModelsDiscussion) { - Discussion = _flarumModelsDiscussion['default']; + Discussion = _flarumModelsDiscussion.default; }, function (_flarumComponentsNotificationGrid) { - NotificationGrid = _flarumComponentsNotificationGrid['default']; + NotificationGrid = _flarumComponentsNotificationGrid.default; }, function (_flarumLockComponentsDiscussionLockedPost) { - DiscussionLockedPost = _flarumLockComponentsDiscussionLockedPost['default']; + DiscussionLockedPost = _flarumLockComponentsDiscussionLockedPost.default; }, function (_flarumLockComponentsDiscussionLockedNotification) { - DiscussionLockedNotification = _flarumLockComponentsDiscussionLockedNotification['default']; + DiscussionLockedNotification = _flarumLockComponentsDiscussionLockedNotification.default; }, function (_flarumLockAddLockBadge) { - addLockBadge = _flarumLockAddLockBadge['default']; + addLockBadge = _flarumLockAddLockBadge.default; }, function (_flarumLockAddLockControl) { - addLockControl = _flarumLockAddLockControl['default']; + addLockControl = _flarumLockAddLockControl.default; }], execute: function () { diff --git a/extensions/lock/js/forum/package.json b/extensions/lock/js/forum/package.json index 62ea6c691..19a7865d9 100644 --- a/extensions/lock/js/forum/package.json +++ b/extensions/lock/js/forum/package.json @@ -1,7 +1,7 @@ { "private": true, "devDependencies": { - "gulp": "^3.8.11", - "flarum-gulp": "^0.1.0" + "gulp": "^3.9.1", + "flarum-gulp": "^0.2.0" } }