Upgrade to flarum-gulp 0.2.0 / Babel 6

2025-07-16 22:31:18 +02:00 · 2016-03-18 09:32:41 +10:30
parent 2b348187d2
commit a16dc26164
4 changed files with 234 additions and 241 deletions
--- a/extensions/flags/js/admin/dist/extension.js
+++ b/extensions/flags/js/admin/dist/extension.js
@@ -1,18 +1,18 @@
-System.register('flarum/flags/components/FlagsSettingsModal', ['flarum/components/SettingsModal'], function (_export) {
 'use strict';

+System.register('flarum/flags/components/FlagsSettingsModal', ['flarum/components/SettingsModal'], function (_export, _context) {
  var SettingsModal, FlagsSettingsModal;
  return {
    setters: [function (_flarumComponentsSettingsModal) {
-      SettingsModal = _flarumComponentsSettingsModal['default'];
+      SettingsModal = _flarumComponentsSettingsModal.default;
    }],
    execute: function () {
-      FlagsSettingsModal = (function (_SettingsModal) {
+      FlagsSettingsModal = function (_SettingsModal) {
        babelHelpers.inherits(FlagsSettingsModal, _SettingsModal);

        function FlagsSettingsModal() {
          babelHelpers.classCallCheck(this, FlagsSettingsModal);
-          babelHelpers.get(Object.getPrototypeOf(FlagsSettingsModal.prototype), 'constructor', this).apply(this, arguments);
+          return babelHelpers.possibleConstructorReturn(this, Object.getPrototypeOf(FlagsSettingsModal).apply(this, arguments));
        }

        babelHelpers.createClass(FlagsSettingsModal, [{
@@ -41,25 +41,25 @@ System.register('flarum/flags/components/FlagsSettingsModal', ['flarum/component
          }
        }]);
        return FlagsSettingsModal;
-      })(SettingsModal);
+      }(SettingsModal);

      _export('default', FlagsSettingsModal);
    }
  };
 });;
-System.register('flarum/flags/main', ['flarum/extend', 'flarum/app', 'flarum/components/PermissionGrid', 'flarum/flags/components/FlagsSettingsModal'], function (_export) {
 'use strict';

+System.register('flarum/flags/main', ['flarum/extend', 'flarum/app', 'flarum/components/PermissionGrid', 'flarum/flags/components/FlagsSettingsModal'], function (_export, _context) {
  var extend, app, PermissionGrid, FlagsSettingsModal;
  return {
    setters: [function (_flarumExtend) {
      extend = _flarumExtend.extend;
    }, function (_flarumApp) {
-      app = _flarumApp['default'];
+      app = _flarumApp.default;
    }, function (_flarumComponentsPermissionGrid) {
-      PermissionGrid = _flarumComponentsPermissionGrid['default'];
+      PermissionGrid = _flarumComponentsPermissionGrid.default;
    }, function (_flarumFlagsComponentsFlagsSettingsModal) {
-      FlagsSettingsModal = _flarumFlagsComponentsFlagsSettingsModal['default'];
+      FlagsSettingsModal = _flarumFlagsComponentsFlagsSettingsModal.default;
    }],
    execute: function () {

--- a/extensions/flags/js/admin/package.json
+++ b/extensions/flags/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"
  }
 }
--- a/extensions/flags/js/forum/dist/extension.js
+++ b/extensions/flags/js/forum/dist/extension.js
@@ -1,51 +1,42 @@
-System.register('flarum/flags/addFlagControl', ['flarum/extend', 'flarum/app', 'flarum/utils/PostControls', 'flarum/components/Button', 'flarum/flags/components/FlagPostModal'], function (_export) {
 'use strict';

+System.register('flarum/flags/addFlagControl', ['flarum/extend', 'flarum/app', 'flarum/utils/PostControls', 'flarum/components/Button', 'flarum/flags/components/FlagPostModal'], function (_export, _context) {
  var extend, app, PostControls, Button, FlagPostModal;
-  return {
-    setters: [function (_flarumExtend) {
-      extend = _flarumExtend.extend;
-    }, function (_flarumApp) {
-      app = _flarumApp['default'];
-    }, function (_flarumUtilsPostControls) {
-      PostControls = _flarumUtilsPostControls['default'];
-    }, function (_flarumComponentsButton) {
-      Button = _flarumComponentsButton['default'];
-    }, function (_flarumFlagsComponentsFlagPostModal) {
-      FlagPostModal = _flarumFlagsComponentsFlagPostModal['default'];
-    }],
-    execute: function () {
+
  _export('default', function () {
    extend(PostControls, 'userControls', function (items, post) {
      if (post.isHidden() || post.contentType() !== 'comment' || !post.canFlag() || post.user() === app.session.user) return;

      items.add('flag', m(
        Button,
-            { icon: 'flag', onclick: function () {
+        { icon: 'flag', onclick: function onclick() {
            return app.modal.show(new FlagPostModal({ post: post }));
          } },
        app.translator.trans('flarum-flags.forum.post_controls.flag_button')
      ));
    });
  });
-    }
-  };
-});;
-System.register('flarum/flags/addFlagsDropdown', ['flarum/extend', 'flarum/app', 'flarum/components/HeaderSecondary', 'flarum/flags/components/FlagsDropdown'], function (_export) {
-  'use strict';

-  var extend, app, HeaderSecondary, FlagsDropdown;
  return {
    setters: [function (_flarumExtend) {
      extend = _flarumExtend.extend;
    }, function (_flarumApp) {
-      app = _flarumApp['default'];
-    }, function (_flarumComponentsHeaderSecondary) {
-      HeaderSecondary = _flarumComponentsHeaderSecondary['default'];
-    }, function (_flarumFlagsComponentsFlagsDropdown) {
-      FlagsDropdown = _flarumFlagsComponentsFlagsDropdown['default'];
+      app = _flarumApp.default;
+    }, function (_flarumUtilsPostControls) {
+      PostControls = _flarumUtilsPostControls.default;
+    }, function (_flarumComponentsButton) {
+      Button = _flarumComponentsButton.default;
+    }, function (_flarumFlagsComponentsFlagPostModal) {
+      FlagPostModal = _flarumFlagsComponentsFlagPostModal.default;
    }],
-    execute: function () {
+    execute: function () {}
+  };
+});;
+'use strict';
+
+System.register('flarum/flags/addFlagsDropdown', ['flarum/extend', 'flarum/app', 'flarum/components/HeaderSecondary', 'flarum/flags/components/FlagsDropdown'], function (_export, _context) {
+  var extend, app, HeaderSecondary, FlagsDropdown;
+
  _export('default', function () {
    extend(HeaderSecondary.prototype, 'items', function (items) {
      if (app.forum.attribute('canViewFlags')) {
@@ -53,32 +44,25 @@ System.register('flarum/flags/addFlagsDropdown', ['flarum/extend', 'flarum/app',
      }
    });
  });
-    }
-  };
-});;
-System.register('flarum/flags/addFlagsToPosts', ['flarum/extend', 'flarum/app', 'flarum/components/CommentPost', 'flarum/components/Button', 'flarum/helpers/punctuate', 'flarum/helpers/username', 'flarum/utils/ItemList', 'flarum/utils/PostControls'], function (_export) {
-  'use strict';

-  var extend, app, CommentPost, Button, punctuate, username, ItemList, PostControls;
  return {
    setters: [function (_flarumExtend) {
      extend = _flarumExtend.extend;
    }, function (_flarumApp) {
-      app = _flarumApp['default'];
-    }, function (_flarumComponentsCommentPost) {
-      CommentPost = _flarumComponentsCommentPost['default'];
-    }, function (_flarumComponentsButton) {
-      Button = _flarumComponentsButton['default'];
-    }, function (_flarumHelpersPunctuate) {
-      punctuate = _flarumHelpersPunctuate['default'];
-    }, function (_flarumHelpersUsername) {
-      username = _flarumHelpersUsername['default'];
-    }, function (_flarumUtilsItemList) {
-      ItemList = _flarumUtilsItemList['default'];
-    }, function (_flarumUtilsPostControls) {
-      PostControls = _flarumUtilsPostControls['default'];
+      app = _flarumApp.default;
+    }, function (_flarumComponentsHeaderSecondary) {
+      HeaderSecondary = _flarumComponentsHeaderSecondary.default;
+    }, function (_flarumFlagsComponentsFlagsDropdown) {
+      FlagsDropdown = _flarumFlagsComponentsFlagsDropdown.default;
    }],
-    execute: function () {
+    execute: function () {}
+  };
+});;
+'use strict';
+
+System.register('flarum/flags/addFlagsToPosts', ['flarum/extend', 'flarum/app', 'flarum/components/CommentPost', 'flarum/components/Button', 'flarum/helpers/punctuate', 'flarum/helpers/username', 'flarum/utils/ItemList', 'flarum/utils/PostControls'], function (_export, _context) {
+  var extend, app, CommentPost, Button, punctuate, username, ItemList, PostControls;
+
  _export('default', function () {
    extend(CommentPost.prototype, 'attrs', function (attrs) {
      if (this.props.post.flags().length) {
@@ -192,34 +176,53 @@ System.register('flarum/flags/addFlagsToPosts', ['flarum/extend', 'flarum/app',
      }
    };
  });
-    }
+
+  return {
+    setters: [function (_flarumExtend) {
+      extend = _flarumExtend.extend;
+    }, function (_flarumApp) {
+      app = _flarumApp.default;
+    }, function (_flarumComponentsCommentPost) {
+      CommentPost = _flarumComponentsCommentPost.default;
+    }, function (_flarumComponentsButton) {
+      Button = _flarumComponentsButton.default;
+    }, function (_flarumHelpersPunctuate) {
+      punctuate = _flarumHelpersPunctuate.default;
+    }, function (_flarumHelpersUsername) {
+      username = _flarumHelpersUsername.default;
+    }, function (_flarumUtilsItemList) {
+      ItemList = _flarumUtilsItemList.default;
+    }, function (_flarumUtilsPostControls) {
+      PostControls = _flarumUtilsPostControls.default;
+    }],
+    execute: function () {}
  };
 });;
-System.register('flarum/flags/components/FlagList', ['flarum/Component', 'flarum/components/LoadingIndicator', 'flarum/helpers/avatar', 'flarum/helpers/username', 'flarum/helpers/icon', 'flarum/helpers/humanTime'], function (_export) {
 'use strict';

+System.register('flarum/flags/components/FlagList', ['flarum/Component', 'flarum/components/LoadingIndicator', 'flarum/helpers/avatar', 'flarum/helpers/username', 'flarum/helpers/icon', 'flarum/helpers/humanTime'], function (_export, _context) {
  var Component, LoadingIndicator, avatar, username, icon, humanTime, FlagList;
  return {
    setters: [function (_flarumComponent) {
-      Component = _flarumComponent['default'];
+      Component = _flarumComponent.default;
    }, function (_flarumComponentsLoadingIndicator) {
-      LoadingIndicator = _flarumComponentsLoadingIndicator['default'];
+      LoadingIndicator = _flarumComponentsLoadingIndicator.default;
    }, function (_flarumHelpersAvatar) {
-      avatar = _flarumHelpersAvatar['default'];
+      avatar = _flarumHelpersAvatar.default;
    }, function (_flarumHelpersUsername) {
-      username = _flarumHelpersUsername['default'];
+      username = _flarumHelpersUsername.default;
    }, function (_flarumHelpersIcon) {
-      icon = _flarumHelpersIcon['default'];
+      icon = _flarumHelpersIcon.default;
    }, function (_flarumHelpersHumanTime) {
-      humanTime = _flarumHelpersHumanTime['default'];
+      humanTime = _flarumHelpersHumanTime.default;
    }],
    execute: function () {
-      FlagList = (function (_Component) {
+      FlagList = function (_Component) {
        babelHelpers.inherits(FlagList, _Component);

        function FlagList() {
          babelHelpers.classCallCheck(this, FlagList);
-          babelHelpers.get(Object.getPrototypeOf(FlagList.prototype), 'constructor', this).apply(this, arguments);
+          return babelHelpers.possibleConstructorReturn(this, Object.getPrototypeOf(FlagList).apply(this, arguments));
        }

        babelHelpers.createClass(FlagList, [{
@@ -263,7 +266,7 @@ System.register('flarum/flags/components/FlagList', ['flarum/Component', 'flarum
                      null,
                      m(
                        'a',
-                        { href: app.route.post(post), className: 'Notification Flag', config: function (element, isInitialized) {
+                        { href: app.route.post(post), className: 'Notification Flag', config: function config(element, isInitialized) {
                            m.route.apply(this, arguments);

                            if (!isInitialized) $(element).on('click', function () {
@@ -300,15 +303,10 @@ System.register('flarum/flags/components/FlagList', ['flarum/Component', 'flarum
              )
            );
          }
-
-          /**
-           * Load flags into the application's cache if they haven't already
-           * been loaded.
-           */
        }, {
          key: 'load',
          value: function load() {
-            var _this = this;
+            var _this2 = this;

            if (app.cache.flags && !app.session.user.attribute('newFlagsCount')) {
              return;
@@ -322,36 +320,36 @@ System.register('flarum/flags/components/FlagList', ['flarum/Component', 'flarum
              app.cache.flags = flags.sort(function (a, b) {
                return b.time() - a.time();
              });
-            })['catch'](function () {}).then(function () {
-              _this.loading = false;
+            }).catch(function () {}).then(function () {
+              _this2.loading = false;
              m.redraw();
            });
          }
        }]);
        return FlagList;
-      })(Component);
+      }(Component);

      _export('default', FlagList);
    }
  };
 });;
-System.register('flarum/flags/components/FlagPostModal', ['flarum/components/Modal', 'flarum/components/Button'], function (_export) {
 'use strict';

+System.register('flarum/flags/components/FlagPostModal', ['flarum/components/Modal', 'flarum/components/Button'], function (_export, _context) {
  var Modal, Button, FlagPostModal;
  return {
    setters: [function (_flarumComponentsModal) {
-      Modal = _flarumComponentsModal['default'];
+      Modal = _flarumComponentsModal.default;
    }, function (_flarumComponentsButton) {
-      Button = _flarumComponentsButton['default'];
+      Button = _flarumComponentsButton.default;
    }],
    execute: function () {
-      FlagPostModal = (function (_Modal) {
+      FlagPostModal = function (_Modal) {
        babelHelpers.inherits(FlagPostModal, _Modal);

        function FlagPostModal() {
          babelHelpers.classCallCheck(this, FlagPostModal);
-          babelHelpers.get(Object.getPrototypeOf(FlagPostModal.prototype), 'constructor', this).apply(this, arguments);
+          return babelHelpers.possibleConstructorReturn(this, Object.getPrototypeOf(FlagPostModal).apply(this, arguments));
        }

        babelHelpers.createClass(FlagPostModal, [{
@@ -483,7 +481,7 @@ System.register('flarum/flags/components/FlagPostModal', ['flarum/components/Mod
        }, {
          key: 'onsubmit',
          value: function onsubmit(e) {
-            var _this = this;
+            var _this2 = this;

            e.preventDefault();

@@ -497,34 +495,34 @@ System.register('flarum/flags/components/FlagPostModal', ['flarum/components/Mod
                post: this.props.post
              }
            }).then(function () {
-              return _this.success = true;
-            })['catch'](function () {}).then(this.loaded.bind(this));
+              return _this2.success = true;
+            }).catch(function () {}).then(this.loaded.bind(this));
          }
        }]);
        return FlagPostModal;
-      })(Modal);
+      }(Modal);

      _export('default', FlagPostModal);
    }
  };
 });;
-System.register('flarum/flags/components/FlagsDropdown', ['flarum/components/NotificationsDropdown', 'flarum/flags/components/FlagList'], function (_export) {
 'use strict';

+System.register('flarum/flags/components/FlagsDropdown', ['flarum/components/NotificationsDropdown', 'flarum/flags/components/FlagList'], function (_export, _context) {
  var NotificationsDropdown, FlagList, FlagsDropdown;
  return {
    setters: [function (_flarumComponentsNotificationsDropdown) {
-      NotificationsDropdown = _flarumComponentsNotificationsDropdown['default'];
+      NotificationsDropdown = _flarumComponentsNotificationsDropdown.default;
    }, function (_flarumFlagsComponentsFlagList) {
-      FlagList = _flarumFlagsComponentsFlagList['default'];
+      FlagList = _flarumFlagsComponentsFlagList.default;
    }],
    execute: function () {
-      FlagsDropdown = (function (_NotificationsDropdown) {
-        babelHelpers.inherits(FlagsDropdown, _NotificationsDropdown);
+      FlagsDropdown = function (_NotificationsDropdow) {
+        babelHelpers.inherits(FlagsDropdown, _NotificationsDropdow);

        function FlagsDropdown() {
          babelHelpers.classCallCheck(this, FlagsDropdown);
-          babelHelpers.get(Object.getPrototypeOf(FlagsDropdown.prototype), 'constructor', this).apply(this, arguments);
+          return babelHelpers.possibleConstructorReturn(this, Object.getPrototypeOf(FlagsDropdown).apply(this, arguments));
        }

        babelHelpers.createClass(FlagsDropdown, [{
@@ -559,34 +557,29 @@ System.register('flarum/flags/components/FlagsDropdown', ['flarum/components/Not
          }
        }]);
        return FlagsDropdown;
-      })(NotificationsDropdown);
+      }(NotificationsDropdown);

      _export('default', FlagsDropdown);
    }
  };
 });;
-System.register('flarum/flags/components/FlagsPage', ['flarum/components/Page', 'flarum/flags/components/FlagList'], function (_export) {
-
-  /**
-   * The `FlagsPage` component shows the flags list. It is only
-   * used on mobile devices where the flags dropdown is within the drawer.
-   */
 'use strict';

+System.register('flarum/flags/components/FlagsPage', ['flarum/components/Page', 'flarum/flags/components/FlagList'], function (_export, _context) {
  var Page, FlagList, FlagsPage;
  return {
    setters: [function (_flarumComponentsPage) {
-      Page = _flarumComponentsPage['default'];
+      Page = _flarumComponentsPage.default;
    }, function (_flarumFlagsComponentsFlagList) {
-      FlagList = _flarumFlagsComponentsFlagList['default'];
+      FlagList = _flarumFlagsComponentsFlagList.default;
    }],
    execute: function () {
-      FlagsPage = (function (_Page) {
+      FlagsPage = function (_Page) {
        babelHelpers.inherits(FlagsPage, _Page);

        function FlagsPage() {
          babelHelpers.classCallCheck(this, FlagsPage);
-          babelHelpers.get(Object.getPrototypeOf(FlagsPage.prototype), 'constructor', this).apply(this, arguments);
+          return babelHelpers.possibleConstructorReturn(this, Object.getPrototypeOf(FlagsPage).apply(this, arguments));
        }

        babelHelpers.createClass(FlagsPage, [{
@@ -612,31 +605,31 @@ System.register('flarum/flags/components/FlagsPage', ['flarum/components/Page',
          }
        }]);
        return FlagsPage;
-      })(Page);
+      }(Page);

      _export('default', FlagsPage);
    }
  };
 });;
-System.register('flarum/flags/main', ['flarum/app', 'flarum/Model', 'flarum/flags/models/Flag', 'flarum/flags/components/FlagsPage', 'flarum/flags/addFlagControl', 'flarum/flags/addFlagsDropdown', 'flarum/flags/addFlagsToPosts'], function (_export) {
 'use strict';

+System.register('flarum/flags/main', ['flarum/app', 'flarum/Model', 'flarum/flags/models/Flag', 'flarum/flags/components/FlagsPage', 'flarum/flags/addFlagControl', 'flarum/flags/addFlagsDropdown', 'flarum/flags/addFlagsToPosts'], function (_export, _context) {
  var app, Model, Flag, FlagsPage, addFlagControl, addFlagsDropdown, addFlagsToPosts;
  return {
    setters: [function (_flarumApp) {
-      app = _flarumApp['default'];
+      app = _flarumApp.default;
    }, function (_flarumModel) {
-      Model = _flarumModel['default'];
+      Model = _flarumModel.default;
    }, function (_flarumFlagsModelsFlag) {
-      Flag = _flarumFlagsModelsFlag['default'];
+      Flag = _flarumFlagsModelsFlag.default;
    }, function (_flarumFlagsComponentsFlagsPage) {
-      FlagsPage = _flarumFlagsComponentsFlagsPage['default'];
+      FlagsPage = _flarumFlagsComponentsFlagsPage.default;
    }, function (_flarumFlagsAddFlagControl) {
-      addFlagControl = _flarumFlagsAddFlagControl['default'];
+      addFlagControl = _flarumFlagsAddFlagControl.default;
    }, function (_flarumFlagsAddFlagsDropdown) {
-      addFlagsDropdown = _flarumFlagsAddFlagsDropdown['default'];
+      addFlagsDropdown = _flarumFlagsAddFlagsDropdown.default;
    }, function (_flarumFlagsAddFlagsToPosts) {
-      addFlagsToPosts = _flarumFlagsAddFlagsToPosts['default'];
+      addFlagsToPosts = _flarumFlagsAddFlagsToPosts.default;
    }],
    execute: function () {

@@ -655,29 +648,29 @@ System.register('flarum/flags/main', ['flarum/app', 'flarum/Model', 'flarum/flag
    }
  };
 });;
-System.register('flarum/flags/models/Flag', ['flarum/Model', 'flarum/utils/mixin'], function (_export) {
 'use strict';

+System.register('flarum/flags/models/Flag', ['flarum/Model', 'flarum/utils/mixin'], function (_export, _context) {
  var Model, mixin, Flag;
  return {
    setters: [function (_flarumModel) {
-      Model = _flarumModel['default'];
+      Model = _flarumModel.default;
    }, function (_flarumUtilsMixin) {
-      mixin = _flarumUtilsMixin['default'];
+      mixin = _flarumUtilsMixin.default;
    }],
    execute: function () {
-      Flag = (function (_Model) {
+      Flag = function (_Model) {
        babelHelpers.inherits(Flag, _Model);

        function Flag() {
          babelHelpers.classCallCheck(this, Flag);
-          babelHelpers.get(Object.getPrototypeOf(Flag.prototype), 'constructor', this).apply(this, arguments);
+          return babelHelpers.possibleConstructorReturn(this, Object.getPrototypeOf(Flag).apply(this, arguments));
        }

        return Flag;
-      })(Model);
+      }(Model);

-      babelHelpers._extends(Flag.prototype, {
+      babelHelpers.extends(Flag.prototype, {
        type: Model.attribute('type'),
        reason: Model.attribute('reason'),
        reasonDetail: Model.attribute('reasonDetail'),
--- a/extensions/flags/js/forum/package.json
+++ b/extensions/flags/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"
  }
 }