Merge pull request #4 from flagrow/added-davis-fixes

Added davis fixes
FriendsOfFlarum · Jan 26, 2017 · 7ca1379 · 7ca1379
2 parents 31aaa32 + 063b565
commit 7ca1379
Show file tree

Hide file tree

Showing 8 changed files with 4,330 additions and 53 deletions.
diff --git a/js/admin/dist/extension.js b/js/admin/dist/extension.js
@@ -1,6 +1,8 @@
 'use strict';
 
 System.register('flagrow/split/main', ['flarum/extend', 'flarum/app', 'flarum/components/PermissionGrid'], function (_export, _context) {
+  "use strict";
+
   var extend, app, PermissionGrid;
   return {
     setters: [function (_flarumExtend) {

diff --git a/js/admin/yarn.lock b/js/admin/yarn.lock
diff --git a/js/forum/dist/extension.js b/js/forum/dist/extension.js
@@ -1,6 +1,8 @@
 'use strict';
 
 System.register('flagrow/split/addSplitControl', ['flarum/extend', 'flarum/app', 'flarum/utils/PostControls', 'flarum/components/Button', 'flarum/components/CommentPost', 'flarum/components/DiscussionPage', 'flagrow/split/components/SplitPostModal', 'flagrow/split/components/SplitController'], function (_export, _context) {
+    "use strict";
+
     var extend, app, PostControls, Button, CommentPost, DiscussionPage, SplitPostModal, SplitController;
 
     _export('default', function (splitController) {
@@ -18,7 +20,6 @@ System.register('flagrow/split/addSplitControl', ['flarum/extend', 'flarum/app',
                 // luceos on feb 7 2016
                 onclick: function onclick() {
                     splitController.start(post.data.attributes.number, discussion.data.id);
-                    splitController.log();
                 }
             }, app.translator.trans('flagrow-split.forum.post_controls.split_button'))]);
         });
@@ -36,7 +37,6 @@ System.register('flagrow/split/addSplitControl', ['flarum/extend', 'flarum/app',
                 // @todo the above is a temporary test solution, we need to implement the modal
                 onclick: function onclick() {
                     splitController.end(post.data.attributes.number);
-                    splitController.log();
                     var splitModal = new SplitPostModal();
                     splitModal.setController(splitController);
                     app.modal.show(splitModal);
@@ -70,6 +70,8 @@ System.register('flagrow/split/addSplitControl', ['flarum/extend', 'flarum/app',
 'use strict';
 
 System.register('flagrow/split/components/SplitController', [], function (_export, _context) {
+    "use strict";
+
     var SplitController;
     return {
         setters: [],
@@ -83,7 +85,7 @@ System.register('flagrow/split/components/SplitController', [], function (_expor
 
                 babelHelpers.createClass(SplitController, [{
                     key: 'start',
-                    value: function start(postId, discussionId) {
+                    value: function start(postId, postNo, discussionId) {
                         // should not be necessary
                         if (postId == 1) return;
 
@@ -93,16 +95,16 @@ System.register('flagrow/split/components/SplitController', [], function (_expor
 
                         $('.PostStream-item').each(function () {
                             var postIndex = $(this).attr('data-number');
-                            if (postIndex > postId) {
+                            if (postIndex > postNo) {
                                 $('.flagrow-split-endSplitButton', $(this)).show();
                             }
                         });
                         $('.flagrow-split-startSplitButton').hide();
                     }
                 }, {
                     key: 'end',
-                    value: function end(postId) {
-                        this._endPost = postId;
+                    value: function end(postNo) {
+                        this._endPost = postNo;
                     }
                 }, {
                     key: 'startPost',
@@ -140,6 +142,8 @@ System.register('flagrow/split/components/SplitController', [], function (_expor
 'use strict';
 
 System.register('flagrow/split/components/SplitPostModal', ['flarum/components/Modal', 'flarum/components/Button', 'flarum/models/Discussion', 'flagrow/split/components/SplitController'], function (_export, _context) {
+    "use strict";
+
     var Modal, Button, Discussion, SplitController, SplitPostModal;
     return {
         setters: [function (_flarumComponentsModal) {
@@ -157,26 +161,20 @@ System.register('flagrow/split/components/SplitPostModal', ['flarum/components/M
 
                 function SplitPostModal() {
                     babelHelpers.classCallCheck(this, SplitPostModal);
-                    return babelHelpers.possibleConstructorReturn(this, Object.getPrototypeOf(SplitPostModal).apply(this, arguments));
+                    return babelHelpers.possibleConstructorReturn(this, (SplitPostModal.__proto__ || Object.getPrototypeOf(SplitPostModal)).apply(this, arguments));
                 }
 
                 babelHelpers.createClass(SplitPostModal, [{
                     key: 'init',
                     value: function init() {
-                        babelHelpers.get(Object.getPrototypeOf(SplitPostModal.prototype), 'init', this).call(this);
-
-                        this.success = false;
-
-                        this.gotError = false;
+                        babelHelpers.get(SplitPostModal.prototype.__proto__ || Object.getPrototypeOf(SplitPostModal.prototype), 'init', this).call(this);
 
                         this.newDiscussionTitle = m.prop('');
                     }
                 }, {
                     key: 'setController',
                     value: function setController(splitController) {
                         this.splitController = splitController;
-
-                        this.splitController.log();
                     }
                 }, {
                     key: 'className',
@@ -191,13 +189,6 @@ System.register('flagrow/split/components/SplitPostModal', ['flarum/components/M
                 }, {
                     key: 'content',
                     value: function content() {
-                        if (this.success && !this.gotError) {
-                            return [m('div', { className: 'Modal-body' }, [m('div', { className: 'Form Form--centered' }, [m('p', { className: 'helpText' }, app.translator.trans('flagrow-split.forum.modalconfirmation_message')), m('div', { className: 'Form-group' }, [m(Button, {
-                                className: 'Button Button--primary Button--block',
-                                onclick: this.hide.bind(this)
-                            }, app.translator.trans('flagrow-split.forum.modal.dismiss_button'))])])])];
-                        }
-
                         return [m('div', { className: 'Modal-body' }, [m('div', { className: 'Form Form--centered' }, [m('div', { className: 'Form-group' }, [m('label', {}, app.translator.trans('flagrow-split.forum.modal.new_discussion_label')), m('input', {
                             name: 'new_discussion_title',
                             value: this.newDiscussionTitle(),
@@ -249,6 +240,8 @@ System.register('flagrow/split/components/SplitPostModal', ['flarum/components/M
 'use strict';
 
 System.register('flagrow/split/extendDiscussionPage', ['flarum/extend', 'flarum/components/DiscussionPage'], function (_export, _context) {
+    "use strict";
+
     var extend, DiscussionPage;
 
     _export('default', function () {
@@ -269,6 +262,8 @@ System.register('flagrow/split/extendDiscussionPage', ['flarum/extend', 'flarum/
 'use strict';
 
 System.register('flagrow/split/main', ['flarum/extend', 'flarum/Model', 'flarum/models/Discussion', 'flagrow/split/addSplitControl', 'flagrow/split/components/SplitController'], function (_export, _context) {
+    "use strict";
+
     var extend, Model, Discussion, addSplitControl, SplitController;
     return {
         setters: [function (_flarumExtend) {

diff --git a/js/forum/src/addSplitControl.js b/js/forum/src/addSplitControl.js
@@ -24,7 +24,6 @@ export default function(splitController) {
                 // luceos on feb 7 2016
                 onclick: () => {
                     splitController.start(post.data.attributes.number, discussion.data.id);
-                    splitController.log();
                 }
             }, app.translator.trans('flagrow-split.forum.post_controls.split_button'))
         ]);
@@ -44,7 +43,6 @@ export default function(splitController) {
                 // @todo the above is a temporary test solution, we need to implement the modal
                 onclick: () => {
                     splitController.end(post.data.attributes.number);
-                    splitController.log();
                     var splitModal = new SplitPostModal();
                     splitModal.setController(splitController);
                     app.modal.show(splitModal);

diff --git a/js/forum/src/components/SplitController.js b/js/forum/src/components/SplitController.js
@@ -3,7 +3,7 @@ export default class SplitController {
         this._isSplitting = false;
     }
 
-    start(postId, discussionId) {
+    start(postId, postNo, discussionId) {
         // should not be necessary
         if (postId == 1) return;
 
@@ -13,16 +13,16 @@ export default class SplitController {
 
         $('.PostStream-item').each(function () {
             var postIndex = $(this).attr('data-number');
-            if (postIndex > postId) {
+            if (postIndex > postNo) {
                 $('.flagrow-split-endSplitButton', $(this)).show();
             }
         });
         $('.flagrow-split-startSplitButton').hide();
 
     }
 
-    end(postId) {
-        this._endPost = postId;
+    end(postNo) {
+        this._endPost = postNo;
     }
 
     startPost() {
@@ -45,4 +45,4 @@ export default class SplitController {
         console.log('startPost:' + this._startPost);
         console.log('endPost:' + this._endPost);
     }
-}
+}
diff --git a/js/forum/src/components/SplitPostModal.js b/js/forum/src/components/SplitPostModal.js
@@ -8,19 +8,12 @@ export default class SplitPostModal extends Modal {
     init() {
         super.init();
 
-        this.success = false;
-
-        this.gotError = false;
-
         this.newDiscussionTitle = m.prop('');
 
     }
 
     setController(splitController) {
         this.splitController = splitController;
-
-        this.splitController.log();
-
     }
 
     className() {
@@ -32,22 +25,6 @@ export default class SplitPostModal extends Modal {
     }
 
     content() {
-        if (this.success && ! this.gotError) {
-            return [
-                m('div', {className: 'Modal-body'}, [
-                    m('div', {className: 'Form Form--centered'}, [
-                        m('p', {className: 'helpText'}, app.translator.trans('flagrow-split.forum.modalconfirmation_message')),
-                        m('div', {className: 'Form-group'}, [
-                            m(Button, {
-                                className: 'Button Button--primary Button--block',
-                                onclick: this.hide.bind(this)
-                            }, app.translator.trans('flagrow-split.forum.modal.dismiss_button'))
-                        ])
-                    ])
-                ])
-            ];
-        }
-
         return [
             m('div', {className: 'Modal-body'}, [
                 m('div', {className: 'Form Form--centered'}, [