From 6183a66ddfbcd70b445c5b234e431e774a764243 Mon Sep 17 00:00:00 2001 From: hbl917070 Date: Fri, 1 Apr 2022 23:06:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=B0=204.0.0-beta.13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tiefsee/bin/output/www/MainWindow.html | 2 +- .../Tiefsee/bin/output/www/SettingWindow.html | 2 +- .../output/www/ejs/MainWindow/MainWindow.ejs | 2 +- .../www/ejs/SettingWindow/SettingWindow.ejs | 2 +- .../bin/output/www/js/MainWindow/InitMenu.js | 50 ++++++------ .../bin/output/www/ts/MainWindow/InitMenu.ts | 78 ++++++++++++------- 6 files changed, 78 insertions(+), 58 deletions(-) diff --git a/Tiefsee/Tiefsee/bin/output/www/MainWindow.html b/Tiefsee/Tiefsee/bin/output/www/MainWindow.html index 8d0403d..9cfee82 100644 --- a/Tiefsee/Tiefsee/bin/output/www/MainWindow.html +++ b/Tiefsee/Tiefsee/bin/output/www/MainWindow.html @@ -662,7 +662,7 @@
-
Tiefsee 4.0.0-beta.12
+
Tiefsee 4.0.0-beta.13
diff --git a/Tiefsee/Tiefsee/bin/output/www/SettingWindow.html b/Tiefsee/Tiefsee/bin/output/www/SettingWindow.html index a858265..917798e 100644 --- a/Tiefsee/Tiefsee/bin/output/www/SettingWindow.html +++ b/Tiefsee/Tiefsee/bin/output/www/SettingWindow.html @@ -553,7 +553,7 @@
版本: - Tiefsee 4.0.0-beta.12 + Tiefsee 4.0.0-beta.13
作者: diff --git a/Tiefsee/Tiefsee/bin/output/www/ejs/MainWindow/MainWindow.ejs b/Tiefsee/Tiefsee/bin/output/www/ejs/MainWindow/MainWindow.ejs index dfbfbd9..932900d 100644 --- a/Tiefsee/Tiefsee/bin/output/www/ejs/MainWindow/MainWindow.ejs +++ b/Tiefsee/Tiefsee/bin/output/www/ejs/MainWindow/MainWindow.ejs @@ -134,7 +134,7 @@
-
Tiefsee 4.0.0-beta.12
+
Tiefsee 4.0.0-beta.13
diff --git a/Tiefsee/Tiefsee/bin/output/www/ejs/SettingWindow/SettingWindow.ejs b/Tiefsee/Tiefsee/bin/output/www/ejs/SettingWindow/SettingWindow.ejs index 43a2ef2..ce9bda7 100644 --- a/Tiefsee/Tiefsee/bin/output/www/ejs/SettingWindow/SettingWindow.ejs +++ b/Tiefsee/Tiefsee/bin/output/www/ejs/SettingWindow/SettingWindow.ejs @@ -479,7 +479,7 @@
版本: - Tiefsee 4.0.0-beta.12 + Tiefsee 4.0.0-beta.13
作者: diff --git a/Tiefsee/Tiefsee/bin/output/www/js/MainWindow/InitMenu.js b/Tiefsee/Tiefsee/bin/output/www/js/MainWindow/InitMenu.js index afda1e6..a069fa6 100644 --- a/Tiefsee/Tiefsee/bin/output/www/js/MainWindow/InitMenu.js +++ b/Tiefsee/Tiefsee/bin/output/www/js/MainWindow/InitMenu.js @@ -368,38 +368,38 @@ class Menu_layout { setCheckState(dom_mainDirList, isMainDirList); setCheckState(dom_mainFileList, isMainFileList); } - function setTopmost(bool) { - if (bool === void 0) { - bool = !isTopmost; + function setTopmost(val) { + if (val === void 0) { + val = !isTopmost; } - isTopmost = bool; - baseWindow.topMost = bool; - setCheckState(dom_topmost, bool); - WV_Window.TopMost = bool; + isTopmost = val; + baseWindow.topMost = val; + setCheckState(dom_topmost, val); + WV_Window.TopMost = val; } - function setMainTools(bool) { - if (bool === void 0) { - bool = !isMainTools; + function setMainTools(val) { + if (val === void 0) { + val = !isMainTools; } - isMainTools = bool; - setCheckState(dom_mainTools, bool); - M.mainTools.setEnabled(bool); + isMainTools = val; + setCheckState(dom_mainTools, val); + M.mainTools.setEnabled(val); } - function setMainDirList(bool) { - if (bool === void 0) { - bool = !isMainDirList; + function setMainDirList(val) { + if (val === void 0) { + val = !isMainDirList; } - isMainDirList = bool; - setCheckState(dom_mainDirList, bool); - M.mainDirList.setEnabled(bool); + isMainDirList = val; + setCheckState(dom_mainDirList, val); + M.mainDirList.setEnabled(val); } - function setMainFileList(bool) { - if (bool === void 0) { - bool = !isMainFileList; + function setMainFileList(val) { + if (val === void 0) { + val = !isMainFileList; } - isMainFileList = bool; - setCheckState(dom_mainFileList, bool); - M.mainFileList.setEnabled(bool); + isMainFileList = val; + setCheckState(dom_mainFileList, val); + M.mainFileList.setEnabled(val); } function setCheckState(dom2, bool) { if (bool) { diff --git a/Tiefsee/Tiefsee/bin/output/www/ts/MainWindow/InitMenu.ts b/Tiefsee/Tiefsee/bin/output/www/ts/MainWindow/InitMenu.ts index a6bc5ed..cce4a8a 100644 --- a/Tiefsee/Tiefsee/bin/output/www/ts/MainWindow/InitMenu.ts +++ b/Tiefsee/Tiefsee/bin/output/www/ts/MainWindow/InitMenu.ts @@ -328,10 +328,6 @@ class InitMenu { - - - - /** * 初始化 menu-圖片的右鍵選單 */ @@ -410,7 +406,7 @@ class InitMenu { } - +/** 版面的下拉選單 */ class Menu_layout { public show; @@ -443,8 +439,12 @@ class Menu_layout { setMainFileList(); }); + //------------------------ - + /** + * 開啟選單 + * @param btn + */ function show(btn?: HTMLElement) { updateData(); if (btn === undefined) { @@ -454,8 +454,9 @@ class Menu_layout { } } + /** - * 判斷哪些選項要被勾選 + * 判斷哪些選項要被勾選，於開啟選單時呼叫 */ function updateData() { isMainTools = M.config.settings.layout.mainToolsEnabled; @@ -466,41 +467,60 @@ class Menu_layout { setCheckState(dom_mainFileList, isMainFileList); } - function setTopmost(bool?: boolean) { - if (bool === undefined) { bool = !isTopmost } - isTopmost = bool; - baseWindow.topMost = bool; - setCheckState(dom_topmost, bool); - WV_Window.TopMost = bool; + /** + * 顯示或隱藏 視窗固定最上層 + * @param val + */ + function setTopmost(val?: boolean) { + if (val === undefined) { val = !isTopmost } + isTopmost = val; + baseWindow.topMost = val; + setCheckState(dom_topmost, val); + WV_Window.TopMost = val; } - function setMainTools(bool?: boolean) { - if (bool === undefined) { bool = !isMainTools } - isMainTools = bool; - setCheckState(dom_mainTools, bool); - M.mainTools.setEnabled(bool); + /** + * 顯示或隱藏 工具列 + * @param val + */ + function setMainTools(val?: boolean) { + if (val === undefined) { val = !isMainTools } + isMainTools = val; + setCheckState(dom_mainTools, val); + M.mainTools.setEnabled(val); } - function setMainDirList(bool?: boolean) { - if (bool === undefined) { bool = !isMainDirList } - isMainDirList = bool; - setCheckState(dom_mainDirList, bool); - M.mainDirList.setEnabled(bool); + /** + * 顯示或隱藏 資料夾預覽列表 + */ + function setMainDirList(val?: boolean) { + if (val === undefined) { val = !isMainDirList } + isMainDirList = val; + setCheckState(dom_mainDirList, val); + M.mainDirList.setEnabled(val); } - function setMainFileList(bool?: boolean) { - if (bool === undefined) { bool = !isMainFileList } - - isMainFileList = bool; - setCheckState(dom_mainFileList, bool); - M.mainFileList.setEnabled(bool); + /** + * 顯示或隱藏檔案預覽列表 + * @param val + */ + function setMainFileList(val?: boolean) { + if (val === undefined) { val = !isMainFileList } + isMainFileList = val; + setCheckState(dom_mainFileList, val); + M.mainFileList.setEnabled(val); } + /** + * 設定是否勾選 + * @param dom + * @param bool + */ function setCheckState(dom: HTMLElement, bool: boolean) { if (bool) { dom.getElementsByClassName("menu-hor-icon")[0].innerHTML = SvgList["yes.svg"];