Set default theme value

Previously needed to manually select a theme to take effect.
FFans · Mar 11, 2021 · b4a09da · b4a09da
1 parent 97cd7fe
commit b4a09da
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 23 deletions.
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/forum/getTheme.js b/js/src/forum/getTheme.js
diff --git a/js/src/forum/index.js b/js/src/forum/index.js
@@ -9,7 +9,7 @@ import { codeLang } from "./codeLang";
 
 app.initializers.add('ffans/clipboardjs', () => {
     var clipboard = null;
-    var theme_name, themeElements, btnChild, btnChildT, btnChildF;
+    var theme_name, btnChild, btnChildT, btnChildF;
 
     function getAtt(key) {
         return app.forum.attribute('ffans-clipboardjs.' + key);
@@ -19,28 +19,25 @@ app.initializers.add('ffans/clipboardjs', () => {
     }
 
     extend(CommentPost.prototype, 'oncreate', function () {
-        theme_name = getAtt('theme_name');
-        themeElements = getTheme(theme_name);
+        theme_name = (getAtt('theme_name') == '') ? 'default' : getAtt('theme_name');
 
         if (getAtt('is_copy_enable') == 1) {
-            btnChild = themeElements[0];
-            btnChildT = themeElements[1];
-            btnChildF = themeElements[2];
+            btnChild = getTheme(theme_name)[0];
+            btnChildT = getTheme(theme_name)[1];
+            btnChildF = getTheme(theme_name)[2];
 
             var pres = this.element.querySelectorAll('pre');
             [].forEach.call(pres, function (pre) {
                 if (pre.className.indexOf("copy-ready") == -1)
                     pre.insertAdjacentHTML('afterBegin',
-                        '<button class="clipboard ' + getAtt('theme_name') + '" data-clipboard-snippet="">' + btnChild + '</button>'
+                        '<button class="clipboard ' + theme_name + '" data-clipboard-snippet="">' + btnChild + '</button>'
                     );
                 pre.classList.add("copy-ready");
                 if (theme_name == 'lingcoder' || theme_name == 'csdn') {
                     pre.classList.add("sticky");
                 }
             });
         }
-    });
-    extend(CommentPost.prototype, 'headerItems', function () {
         if (getAtt('is_show_codeLang') == 1) {
             codeLang();
         }
@@ -90,17 +87,18 @@ app.initializers.add('ffans/clipboardjs', () => {
     function fallbackMessage(action) {
         var actionMsg = '';
         var actionKey = (action === 'cut' ? 'X' : 'C');
+        action = (action === 'copy') ? getTrans('action_copy') : getTrans('action_cut');
         if (/iPhone|iPad/i.test(navigator.userAgent)) {
-            actionMsg = app.translator.trans('ffans-clipboardjs.forum.no_support') + ' :(';
+            actionMsg = getTrans('no_support') + ' :(';
         } else if (/Mac/i.test(navigator.userAgent)) {
-            actionMsg = app.translator.trans('ffans-clipboardjs.forum.mac_msg', {
+            actionMsg = app.translator.trans('ffans-clipboardjs.forum.msg', {
                 actionKey: '⌘-' + actionKey,
-                action: (action === 'copy' ? app.translator.trans('ffans-clipboardjs.forum.action_copy') : app.translator.trans('ffans-clipboardjs.forum.action_cut')),
+                action: action,
             });
         } else {
-            actionMsg = app.translator.trans('ffans-clipboardjs.forum.pc_msg', {
+            actionMsg = app.translator.trans('ffans-clipboardjs.forum.msg', {
                 actionKey: 'Ctrl-' + actionKey,
-                action: (action === 'copy' ? app.translator.trans('ffans-clipboardjs.forum.action_copy') : app.translator.trans('ffans-clipboardjs.forum.action_cut')),
+                action: action,
             });
         }
         actionMsg = actionMsg.join("");

diff --git a/resources/locale/en.yml b/resources/locale/en.yml
@@ -18,5 +18,4 @@ ffans-clipboardjs:
       ok_btn: 'Coppied'
       error_btn: 'Error'
       no_support: 'No support'
-      mac_msg: 'Press {actionKey} to {action}'
-      pc_msg: 'Press {actionKey} to {action}'
+      msg: 'Press {actionKey} to {action}'
diff --git a/resources/locale/zh.yml b/resources/locale/zh.yml
@@ -18,5 +18,4 @@ ffans-clipboardjs:
       ok_btn: '复制成功'
       error_btn: '复制失败'
       no_support: '不支持 :('
-      mac_msg: '按 {actionKey} {action}'
-      pc_msg: '按 {actionKey} {action}'
+      msg: '按 {actionKey} {action}'