Merge pull request #6 from jslirola/flarum14

Update for Flarum beta 14
jslirola · Nov 14, 2020 · f063e38 · f063e38
2 parents 8a016a6 + 8377ca4
commit f063e38
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 32 deletions.
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
         "source": "https://github.com/jslirola/flarum-ext-login2seeplus"
     },
     "require": {
-        "flarum/core": "^0.1.0-beta.13"
+        "flarum/core": "^0.1.0-beta.14"
     },
     "extra": {
         "flarum-extension": {

diff --git a/js/dist/admin.js b/js/dist/admin.js
diff --git a/js/dist/admin.js.map b/js/dist/admin.js.map
diff --git a/js/dist/forum.js b/js/dist/forum.js
diff --git a/js/dist/forum.js.map b/js/dist/forum.js.map
diff --git a/js/src/admin/components/Login2SeePlusSettingsModal.js b/js/src/admin/components/Login2SeePlusSettingsModal.js
@@ -33,32 +33,28 @@ export default class Login2SeePlusSettingsModal extends SettingsModal
                 m('fieldset', {className: 'JSLirolaLogin2SeePlus-image'}, [
                     m('legend', {}, app.translator.trans('jslirola-login2seeplus.admin.hide')),
                     Switch.component(
-                    {
-                        state: JSON.parse(this.setting('jslirola.login2seeplus.link', 0)()),
-                        onchange: this.setting('jslirola.login2seeplus.link', 1),
-                        children: app.translator.trans('jslirola-login2seeplus.admin.link'),
-                    }),
+                        {
+                            state: JSON.parse(this.setting('jslirola.login2seeplus.link', 0)()),
+                            onchange: this.setting('jslirola.login2seeplus.link', 1)
+                        }, app.translator.trans('jslirola-login2seeplus.admin.link')),
                     Switch.component(
-                    {
-                        state: JSON.parse(this.setting('jslirola.login2seeplus.image', 0)()),
-                        onchange: this.setting('jslirola.login2seeplus.image', 1),
-                        children: app.translator.trans('jslirola-login2seeplus.admin.image'),
-                    }),
+                        {
+                            state: JSON.parse(this.setting('jslirola.login2seeplus.image', 0)()),
+                            onchange: this.setting('jslirola.login2seeplus.image', 1)
+                        }, app.translator.trans('jslirola-login2seeplus.admin.image')),
                     Switch.component(
-                    {
-                        state: JSON.parse(this.setting('jslirola.login2seeplus.code', 0)()),
-                        onchange: this.setting('jslirola.login2seeplus.code', 1),
-                        children: app.translator.trans('jslirola-login2seeplus.admin.code'),
-                    }),
+                        {
+                            state: JSON.parse(this.setting('jslirola.login2seeplus.code', 0)()),
+                            onchange: this.setting('jslirola.login2seeplus.code', 1)
+                        }, app.translator.trans('jslirola-login2seeplus.admin.code')),
                 ]),
                 m('fieldset', {className: 'JSLirolaLogin2SeePlus-php'}, [
                     m('legend', {}, app.translator.trans('jslirola-login2seeplus.admin.php.title')),
                     Switch.component(
-                    {
-                        state: JSON.parse(this.setting('jslirola.login2seeplus.php', 0)()),
-                        onchange: this.setting('jslirola.login2seeplus.php', 1),
-                        children: app.translator.trans('jslirola-login2seeplus.admin.php.label'),
-                    }),
+                        {
+                            state: JSON.parse(this.setting('jslirola.login2seeplus.php', 0)()),
+                            onchange: this.setting('jslirola.login2seeplus.php', 1)
+                        }, app.translator.trans('jslirola-login2seeplus.admin.php.label')),
                     m('div', {className: 'helpText'}, app.translator.trans('jslirola-login2seeplus.admin.php.help')),
                 ]),
             ]),

diff --git a/js/src/admin/index.js b/js/src/admin/index.js
@@ -5,5 +5,5 @@ import Login2SeePlusSettingsModal from './components/Login2SeePlusSettingsModal'
 
 app.initializers.add('jslirola-login2seeplus', () =>
 {
-    app.extensionSettings['jslirola-login2seeplus'] = () => app.modal.show(new Login2SeePlusSettingsModal());
+    app.extensionSettings['jslirola-login2seeplus'] = () => app.modal.show(Login2SeePlusSettingsModal);
 });