Update for Beta16

Update BE and FE for beta 16
FFans · Mar 16, 2021 · d31a681 · d31a681
1 parent b4a09da
commit d31a681
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 18 deletions.
diff --git a/composer.json b/composer.json
@@ -9,7 +9,7 @@
   "type": "flarum-extension",
   "license": "MIT",
   "require": {
-    "flarum/core": ">=0.1.0-beta.15 <0.1.0-beta.16"
+    "flarum/core": ">=0.1.0-beta.15 <0.1.0-beta.17"
   },
   "authors": [
     {

diff --git a/extend.php b/extend.php
@@ -24,4 +24,8 @@
     function (Dispatcher $dispatcher) {
         $dispatcher->subscribe(Listeners\SaveSettings::class);
     },
+    (new Extend\Settings())
+        ->serializeToForum('themeName', 'ffans-clipboardjs.theme_name')
+        ->serializeToForum('isCopyEnable', 'ffans-clipboardjs.is_copy_enable', 'boolVal')
+        ->serializeToForum('isShowCodeLang', 'ffans-clipboardjs.is_show_codeLang', 'boolVal'),
 ];
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/index.js b/js/src/admin/index.js
@@ -1,4 +1,4 @@
-import app from 'flarum/app';
+import app from 'flarum/common/app';
 
 app.initializers.add('ffans/clipboardjs', (app) => {
 
@@ -26,12 +26,12 @@ app.initializers.add('ffans/clipboardjs', (app) => {
     })
     .registerSetting({
       setting: 'ffans-clipboardjs.is_copy_enable',
-      type: 'boolean',
+      type: 'switch',
       label: getTrans('copy_enable_label')
     })
     .registerSetting({
       setting: 'ffans-clipboardjs.is_show_codeLang',
-      type: 'boolean',
+      type: 'switch',
       label: getTrans('codeLang_label')
     })
   console.log('[ffans/clipboardjs] Hello, admin!');

diff --git a/js/src/forum/getTheme.js b/js/src/forum/getTheme.js