From c0b7414b32c9de02781eb521075c67a509d69585 Mon Sep 17 00:00:00 2001
From: Frost-ZX <30585462+Frost-ZX@users.noreply.github.com>
Date: Tue, 19 Nov 2019 21:28:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=8820191119=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md            | 10 +++++-----
 dev/css/all.css      | 10 ++++++++++
 dev/css/index.css    |  7 ++++---
 dev/index.html       |  7 ++++---
 dev/js/index.js      | 38 +++++++++++++++++++++++++++-----------
 docs/css/all.css     | 10 ++++++++++
 docs/css/index.css   |  7 ++++---
 docs/index.html      |  7 ++++---
 docs/js/index.min.js |  3 ++-
 9 files changed, 70 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index f6398fd..ab491e6 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,14 @@
 ## 简介
 
-### 名称（可能会更改）
+### 名称
 
 - Frost 网址导航
 - Frost Site Navigation
 
 ### 页面链接
 
-- [链接一](https://frost-zx.github.io/frost-navigation/)
-- [链接二](https://nav.frost-zx.top/)
+- [链接一](https://frost-zx.github.io/frost-navigation/)（GitHub Pages）
+- [链接二](https://frost-zx.top/)（网站）
 
 ### 提交链接
 
@@ -19,7 +19,7 @@
 ### 修正链接
 
 有以下两种方法：
-1. 到 [发布页面](https://blog.frost-zx.top/) 的评论区提交。（推荐使用此方法）
+1. 到 [发布页面](https://blog.frost-zx.top/website/frost-navigation.html) 的评论区提交。（推荐使用此方法）
 2. 到 [Issues](https://github.com/Frost-ZX/frost-navigation/issues) 提交。
 
 ### 离线使用
@@ -28,7 +28,7 @@
 
 ### 自定义
 
-[下载](https://github.com/Frost-ZX/frost-navigation/archive/master.zip) 后打开 `docs/index.html` 和 `docs/js/script.min.js`（完整文件：`dev/js/script.js`） 根据需要进行修改。
+[下载](https://github.com/Frost-ZX/frost-navigation/archive/master.zip) 后打开 `dev/index.html` 和 `dev/js/script.js` 根据需要进行修改。
 
 ## 第三方资源
 
diff --git a/dev/css/all.css b/dev/css/all.css
index 80a051e..61f2e9f 100644
--- a/dev/css/all.css
+++ b/dev/css/all.css
@@ -101,3 +101,13 @@ html {
         transform: rotate(360deg);
     }
 }
+@keyframes ToolPanelShow {
+    from {
+        bottom: -110%;
+        opacity: 0;
+    }
+    to {
+        bottom: 0;
+        opacity: 1;
+    }
+}
diff --git a/dev/css/index.css b/dev/css/index.css
index cdfb2d5..8df3c7c 100644
--- a/dev/css/index.css
+++ b/dev/css/index.css
@@ -208,13 +208,14 @@ footer p {
 /* 工具面板 */
 
 .tool-panel {
-    /* visibility: hidden; */
+    display: none;
     z-index: 100;
     position: fixed;
     left: 0;
-    bottom: -110%;
-    opacity: 0;
+    bottom: 0;
+    opacity: 1;
     transition: all 0.5s;
+    animation: ToolPanelShow 0.5s;
 }
 
 .tool-panel-bar {
diff --git a/dev/index.html b/dev/index.html
index 3cf7978..6c6d278 100644
--- a/dev/index.html
+++ b/dev/index.html
@@ -428,6 +428,7 @@
                         <ul>
                             <li><a href="https://www.toolnb.com/">爱资料在线工具</a></li>
                             <li><a href="http://tool.mkblog.cn/">孟坤工具箱</a></li>
+                            <li><a href="https://wn.run/">万能命令 - 快捷寻找和直达你想要的各类工具</a></li>
                             <li><a href="http://tool.uixsj.cn/">现实君工具箱</a></li>
                             <li><a href="https://tool.lu/">在线工具</a></li>
                             <li><a href="http://www.bejson.com/">Be JSON</a></li>
@@ -438,7 +439,7 @@
                         <a href="#">举报</a>
                         <ul>
                             <li><a href="https://www.12321.cn/">12321 网络不良与垃圾信息举报受理中心</a></li>
-                            <li><a href="http://net.china.com.cn/">国家网信办举报中心</a></li>
+                            <li><a href="http://www.12377.cn/">国家网信办举报中心</a></li>
                         </ul>
                     </li>
                     <li>
@@ -1264,7 +1265,7 @@
         <div class="tool-panel-bar">
             <div class="tool-panel-blank"></div>
             <div class="tool-panel-newtab" onclick="window.open('tool.html');">新窗口</div>
-            <div class="tool-panel-close" onclick="ToolPanel.style.bottom = '-110%'; ToolPanel.style.opacity = '0';">关闭</div>
+            <div class="tool-panel-close" onclick="closeToolPanel()">关闭</div>
         </div>
         <div class="tool-panel-iframe">
             <iframe src="tool.html" frameborder="0"></iframe>
@@ -1275,7 +1276,7 @@
     <!-- 悬浮栏 -->
     <div class="floating-bar">
         <div class="floating-bar-search" onclick="SearchPanel.style.visibility = 'visible'; SearchInput.focus();">查找</div>
-        <div class="floating-bar-tool" onclick="ToolPanel.style.bottom = '0'; ToolPanel.style.opacity = '1';">工具</div>
+        <div class="floating-bar-tool" onclick="showToolPanel()">工具</div>
         <div class="floating-bar-about" onclick="window.open('https://github.com/Frost-ZX/frost-navigation/blob/master/README.md');">关于</div>
         <div class="floating-bar-totop" onclick="document.body.scrollTop = 0; document.documentElement.scrollTop = 0;">▲</div>
     </div>
diff --git a/dev/js/index.js b/dev/js/index.js
index f74bc51..67c77a7 100644
--- a/dev/js/index.js
+++ b/dev/js/index.js
@@ -3,7 +3,6 @@
 /* ---- */
 
 // Slinky 插件的设置 //
-
 var SlinkyOption = {
     title: true,
     speed: 200
@@ -15,11 +14,9 @@ var ListCountMax = 17;                                                         /
 var FullsSreenText = document.getElementsByClassName("fullscreen-text")[0];    // 全屏文字
 
 // main 中的 A 标签的对象的集合（链接列表）//
-
 var LinkList = document.getElementsByTagName("main")[0].getElementsByTagName("a");
 
 // 搜索面板 //
-
 var SearchMode = 1;
 var SearchPanel = document.getElementsByClassName("search-panel")[0];          // 搜索面板
 var SearchInput = document.getElementsByClassName("search-input")[0];          // 搜索输入框
@@ -28,14 +25,12 @@ var SearchResultLink = document.getElementById("search-result-link");          /
 var SearchResultItem = "";
 
 // 搜索引擎 //
-
 var SearchEngineBaidu = document.getElementById("search-engine-baidu");        // 百度
 var SearchEngineBing = document.getElementById("search-engine-bing");          // Bing
 var SearchEngineGoogle = document.getElementById("search-engine-google");      // Google
 var SearchEnginebilibili = document.getElementById("search-engine-bilibili");  // bilibili
 
 // 工具面板 //
-
 var ToolPanel = document.getElementsByClassName("tool-panel")[0];   
 
 
@@ -44,7 +39,6 @@ var ToolPanel = document.getElementsByClassName("tool-panel")[0];
 /* ---- */
 
 // 查找字符 tChar 在 str 中第 num 次出现的位置 //
-
 function findChar(str, tChar, num) {
     var charPos = str.indexOf(tChar);
     num = num - 1;
@@ -56,8 +50,9 @@ function findChar(str, tChar, num) {
     return charPos;
 }
 
-// 设置 target = "_blank" //
+/* 链接列表 */
 
+// 设置 target = "_blank" //
 function setTarget() {
     for (var i = 0; i < LinkList.length; i++) {
         if (LinkList[i].href.endsWith("#") == false) {
@@ -73,7 +68,6 @@ function setTarget() {
 }
 
 // 显示列表 //
-
 function displayList() {
     document.getElementsByTagName("main")[0].style.opacity = "1";
     FullsSreenText.style.opacity = "0";
@@ -81,7 +75,6 @@ function displayList() {
 }
 
 // 加载列表 //
-
 function loadList() {
     ListCount = ListCount + 1;
     ListID = "#list_" + ListCount;
@@ -97,7 +90,7 @@ function loadList() {
 }
 var I_LoadList = setInterval("loadList()", 100);                               // 加载列表，间隔 100 毫秒
 
-// 搜索面板 //
+/* 链接搜索 */
 
 function searchLink() {
     var LinkListCount = LinkList.length;                                       // 循环次数
@@ -134,8 +127,9 @@ function searchLink() {
     }
 }
 
-// 搜索引擎 //
+/* 搜索引擎 */
 
+// 搜索 //
 function searchWeb() {
     var GetSearchWord = document.getElementById("search-engine-input");        // 关键词输入框
     var SearchWord = GetSearchWord.value;                                      // 关键词
@@ -151,6 +145,8 @@ function searchWeb() {
         GetSearchWord.value = "搜索引擎选择有误！"
     }
 }
+
+// 储存当前搜索引擎 //
 function setSearchEngine(Name) {
     switch (Name)
     {
@@ -168,6 +164,8 @@ function setSearchEngine(Name) {
         break;
     }
 }
+
+// 设置当前搜索引擎 //
 function getSearchEngine() {
     var SearchEngine = localStorage.getItem("SearchEngine");
     if (SearchEngine == "baidu") {
@@ -181,3 +179,21 @@ function getSearchEngine() {
     }
 }
 getSearchEngine();
+
+/* 工具面板 */
+
+// 显示 //
+function showToolPanel() {
+    ToolPanel.style.display = 'block';
+}
+
+// 关闭 //
+function closeToolPanel() {
+    ToolPanel.style.bottom = '-110%';
+    ToolPanel.style.opacity = '0';
+    setTimeout(function () {
+        ToolPanel.style.display = 'none';
+        ToolPanel.style.bottom = '0';
+        ToolPanel.style.opacity = '1';
+    }, 500);
+}
diff --git a/docs/css/all.css b/docs/css/all.css
index 80a051e..61f2e9f 100644
--- a/docs/css/all.css
+++ b/docs/css/all.css
@@ -101,3 +101,13 @@ html {
         transform: rotate(360deg);
     }
 }
+@keyframes ToolPanelShow {
+    from {
+        bottom: -110%;
+        opacity: 0;
+    }
+    to {
+        bottom: 0;
+        opacity: 1;
+    }
+}
diff --git a/docs/css/index.css b/docs/css/index.css
index cdfb2d5..8df3c7c 100644
--- a/docs/css/index.css
+++ b/docs/css/index.css
@@ -208,13 +208,14 @@ footer p {
 /* 工具面板 */
 
 .tool-panel {
-    /* visibility: hidden; */
+    display: none;
     z-index: 100;
     position: fixed;
     left: 0;
-    bottom: -110%;
-    opacity: 0;
+    bottom: 0;
+    opacity: 1;
     transition: all 0.5s;
+    animation: ToolPanelShow 0.5s;
 }
 
 .tool-panel-bar {
diff --git a/docs/index.html b/docs/index.html
index ad04310..5eb54e9 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -428,6 +428,7 @@
                         <ul>
                             <li><a href="https://www.toolnb.com/">爱资料在线工具</a></li>
                             <li><a href="http://tool.mkblog.cn/">孟坤工具箱</a></li>
+                            <li><a href="https://wn.run/">万能命令 - 快捷寻找和直达你想要的各类工具</a></li>
                             <li><a href="http://tool.uixsj.cn/">现实君工具箱</a></li>
                             <li><a href="https://tool.lu/">在线工具</a></li>
                             <li><a href="http://www.bejson.com/">Be JSON</a></li>
@@ -438,7 +439,7 @@
                         <a href="#">举报</a>
                         <ul>
                             <li><a href="https://www.12321.cn/">12321 网络不良与垃圾信息举报受理中心</a></li>
-                            <li><a href="http://net.china.com.cn/">国家网信办举报中心</a></li>
+                            <li><a href="http://www.12377.cn/">国家网信办举报中心</a></li>
                         </ul>
                     </li>
                     <li>
@@ -1264,7 +1265,7 @@
         <div class="tool-panel-bar">
             <div class="tool-panel-blank"></div>
             <div class="tool-panel-newtab" onclick="window.open('tool.html');">新窗口</div>
-            <div class="tool-panel-close" onclick="ToolPanel.style.bottom = '-110%'; ToolPanel.style.opacity = '0';">关闭</div>
+            <div class="tool-panel-close" onclick="closeToolPanel()">关闭</div>
         </div>
         <div class="tool-panel-iframe">
             <iframe src="tool.html" frameborder="0"></iframe>
@@ -1275,7 +1276,7 @@
     <!-- 悬浮栏 -->
     <div class="floating-bar">
         <div class="floating-bar-search" onclick="SearchPanel.style.visibility = 'visible'; SearchInput.focus();">查找</div>
-        <div class="floating-bar-tool" onclick="ToolPanel.style.bottom = '0'; ToolPanel.style.opacity = '1';">工具</div>
+        <div class="floating-bar-tool" onclick="showToolPanel()">工具</div>
         <div class="floating-bar-about" onclick="window.open('https://github.com/Frost-ZX/frost-navigation/blob/master/README.md');">关于</div>
         <div class="floating-bar-totop" onclick="document.body.scrollTop = 0; document.documentElement.scrollTop = 0;">▲</div>
     </div>
diff --git a/docs/js/index.min.js b/docs/js/index.min.js
index 0123981..8f8b0e8 100644
--- a/docs/js/index.min.js
+++ b/docs/js/index.min.js
@@ -8,4 +8,5 @@ function searchWeb(){var GetSearchWord=document.getElementById("search-engine-in
 function setSearchEngine(Name){switch(Name)
 {case"baidu":localStorage.setItem("SearchEngine","baidu");break;case"bing":localStorage.setItem("SearchEngine","bing");break;case"google":localStorage.setItem("SearchEngine","google");break;case"bilibili":localStorage.setItem("SearchEngine","bilibili");break;}}
 function getSearchEngine(){var SearchEngine=localStorage.getItem("SearchEngine");if(SearchEngine=="baidu"){SearchEngineBaidu.checked=true;}else if(SearchEngine=="bing"){SearchEngineBing.checked=true;}else if(SearchEngine=="google"){SearchEngineGoogle.checked=true;}else if(SearchEngine=="bilibili"){SearchEnginebilibili.checked=true;}}
-getSearchEngine();
+getSearchEngine();function showToolPanel(){ToolPanel.style.display='block';}
+function closeToolPanel(){ToolPanel.style.bottom='-110%';ToolPanel.style.opacity='0';setTimeout(function(){ToolPanel.style.display='none';ToolPanel.style.bottom='0';ToolPanel.style.opacity='1';},500);}