diff --git a/README.md b/README.md index ab491e6..39162ae 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ ### 页面链接 - [链接一](https://frost-zx.github.io/frost-navigation/)（GitHub Pages） -- [链接二](https://frost-zx.top/)（网站） +- [链接二](http://nav.frost-zx.top/)（网站） ### 提交链接 diff --git a/dev/css/slinky.css b/dev/css/slinky.css index 4487fa1..44f176a 100644 --- a/dev/css/slinky.css +++ b/dev/css/slinky.css @@ -5,7 +5,7 @@ transform: translateZ(0); } -.slinky-menu > ul { +.slinky-menu>ul { left: 0; position: relative; transform: translateZ(0); @@ -78,6 +78,11 @@ background: rgba(90, 200, 250, 0.5); } +/* 显示链接 */ +.slinky-theme-default a:not([href="#"]):not([href^="javascript"])::after { + content: attr(href); +} + .slinky-theme-default .next::after, .slinky-theme-default .back::before { background: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCI+ICAgIDxwYXRoIGQ9Ik0xMi4yMTkgMi4yODFMMTAuNzggMy43MiAxOC4wNjIgMTFIMnYyaDE2LjA2M2wtNy4yODIgNy4yODEgMS40MzggMS40MzggOS05IC42ODctLjcxOS0uNjg3LS43MTl6IiAvPjwvc3ZnPg==) center no-repeat; diff --git a/dev/css/tool.css b/dev/css/tool.css index 9c75b61..c1dbca7 100644 --- a/dev/css/tool.css +++ b/dev/css/tool.css @@ -97,7 +97,6 @@ body { font-weight: bold; } #tool-unixtime > p { - text-align: center; font-size: 16px; font-weight: bold; } @@ -180,6 +179,20 @@ body { font-size: 14px; } +/* 新窗口（小窗）中打开 */ + +#tool-newwindow > div { + margin-bottom: 10px; +} +#tool-newwindow-link input[type="text"] { + padding: 5px; + width: 80%; +} +#tool-newwindow-meta input[type="text"] { + padding: 5px; + width: 100px; +} + /* 运行 JavaScript */ #tool-runjs textarea { diff --git a/dev/index.html b/dev/index.html index 6c6d278..f42210c 100644 --- a/dev/index.html +++ b/dev/index.html @@ -29,19 +29,19 @@
  • diff --git a/dev/js/index.js b/dev/js/index.js index 67c77a7..9bf0552 100644 --- a/dev/js/index.js +++ b/dev/js/index.js @@ -11,27 +11,27 @@ var SlinkyOption = { var ListID = "#list_"; // 列表 ID 前缀 var ListCount = 0; var ListCountMax = 17; // 列表总数 -var FullsSreenText = document.getElementsByClassName("fullscreen-text")[0]; // 全屏文字 +var FullsSreenText = document.querySelector(".fullscreen-text"); // 全屏文字 // main 中的 A 标签的对象的集合（链接列表）// -var LinkList = document.getElementsByTagName("main")[0].getElementsByTagName("a"); +var LinkList = document.querySelectorAll("main a"); -// 搜索面板 // +// 查找面板 // var SearchMode = 1; -var SearchPanel = document.getElementsByClassName("search-panel")[0]; // 搜索面板 -var SearchInput = document.getElementsByClassName("search-input")[0]; // 搜索输入框 -var SearchResultTitle = document.getElementById("search-result-title"); // 搜索结果（标题） -var SearchResultLink = document.getElementById("search-result-link"); // 搜索结果（链接） +var SearchPanel = document.querySelector(".search-panel"); // 查找面板 +var SearchInput = document.querySelector(".search-input"); // 查找输入框 +var SearchResultTitle = document.querySelector("#search-result-title"); // 查找结果（标题） +var SearchResultLink = document.querySelector("#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 SearchEngineBaidu = document.querySelector("#search-engine-baidu"); // 百度 +var SearchEngineBing = document.querySelector("#search-engine-bing"); // Bing +var SearchEngineGoogle = document.querySelector("#search-engine-google"); // Google +var SearchEnginebilibili = document.querySelector("#search-engine-bilibili"); // bilibili // 工具面板 // -var ToolPanel = document.getElementsByClassName("tool-panel")[0]; +var ToolPanel = document.querySelector(".tool-panel"); /* ---- */ @@ -69,9 +69,11 @@ function setTarget() { // 显示列表 // function displayList() { - document.getElementsByTagName("main")[0].style.opacity = "1"; + document.querySelector("main").style.opacity = "1"; FullsSreenText.style.opacity = "0"; - setTimeout("document.getElementsByClassName('fullscreen-text')[0].style.display = 'none';", 1000); + setTimeout(function () { + document.querySelector(".fullscreen-text").style.display = "none"; + }, 1000); } // 加载列表 // @@ -79,30 +81,30 @@ function loadList() { ListCount = ListCount + 1; ListID = "#list_" + ListCount; $(ListID).slinky(SlinkyOption); - FullsSreenText.innerText = "已加载 " + ListCount + " 个分类"; // 全屏文字 + FullsSreenText.innerHTML = "已加载 " + ListCount + " 个分类"; // 全屏文字 // 加载完毕 // if (ListCount == ListCountMax) { clearInterval(I_LoadList); // 停止定时执行 - FullsSreenText.innerText = "加载完毕"; // 全屏文字 + FullsSreenText.innerHTML = "加载完毕"; // 全屏文字 setTarget(); // 设置 target displayList(); // 显示列表 } } var I_LoadList = setInterval("loadList()", 100); // 加载列表，间隔 100 毫秒 -/* 链接搜索 */ +/* 链接查找 */ function searchLink() { var LinkListCount = LinkList.length; // 循环次数 - var SearchWord = SearchInput.value.toLowerCase(); // 搜索关键词 + var SearchWord = SearchInput.value.toLowerCase(); // 查找关键词 if (SearchMode == 1 && SearchWord != "") { - SearchResultTitle.innerHTML = ""; // 清空搜索结果（标题） - SearchResultLink.innerHTML = ""; // 清空搜索结果（链接） + SearchResultTitle.innerHTML = ""; // 清空查找结果（标题） + SearchResultLink.innerHTML = ""; // 清空查找结果（链接） for (var i = 0; i < LinkListCount; i++) { // 排除 href 是 # 的元素 // if (LinkList[i].href.endsWith("#") == false) { // 匹配关键词 // - if (LinkList[i].innerText.toLowerCase().indexOf(SearchWord) != -1) { + if (LinkList[i].innerHTML.toLowerCase().indexOf(SearchWord) != -1) { // 匹配标题 // SearchResultItem = LinkList[i].cloneNode(true); SearchResultTitle.appendChild(SearchResultItem); // 复制元素 @@ -118,9 +120,9 @@ function searchLink() { SearchResultLink.innerHTML = "未输入关键词"; } else if (SearchMode == 2) { SearchInput.value = ""; // 清空输入框 - SearchResultTitle.innerHTML = ""; // 清空搜索结果（标题） - SearchResultLink.innerHTML = ""; // 清空搜索结果（链接） - SearchPanel.style.visibility = "hidden"; // 隐藏搜索面板 + SearchResultTitle.innerHTML = ""; // 清空查找结果（标题） + SearchResultLink.innerHTML = ""; // 清空查找结果（链接） + SearchPanel.style.visibility = "hidden"; // 隐藏查找面板 } else { SearchResultTitle.innerHTML = ""; SearchResultLink.innerHTML = "异常"; @@ -131,7 +133,7 @@ function searchLink() { // 搜索 // function searchWeb() { - var GetSearchWord = document.getElementById("search-engine-input"); // 关键词输入框 + var GetSearchWord = document.querySelector("#search-engine-input"); // 关键词输入框 var SearchWord = GetSearchWord.value; // 关键词 if (SearchEngineBaidu.checked == true) { window.open("https://www.baidu.com/s?ie=UTF-8&wd=" + SearchWord); @@ -151,31 +153,40 @@ function setSearchEngine(Name) { switch (Name) { case "baidu": - localStorage.setItem("SearchEngine", "baidu"); - break; + localStorage.setItem("SearchEngine", "baidu"); + break; case "bing": - localStorage.setItem("SearchEngine", "bing"); - break; + localStorage.setItem("SearchEngine", "bing"); + break; case "google": - localStorage.setItem("SearchEngine", "google"); - break; + localStorage.setItem("SearchEngine", "google"); + break; case "bilibili": - localStorage.setItem("SearchEngine", "bilibili"); - break; + localStorage.setItem("SearchEngine", "bilibili"); + break; + default: + 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; + switch (SearchEngine){ + case "baidu": + SearchEngineBaidu.checked = true; + break; + case "bing": + SearchEngineBing.checked = true; + break; + case "google": + SearchEngineGoogle.checked = true; + break; + case "bilibili": + SearchEnginebilibili.checked = true; + break; + default: + break; } } getSearchEngine(); @@ -184,16 +195,16 @@ getSearchEngine(); // 显示 // function showToolPanel() { - ToolPanel.style.display = 'block'; + ToolPanel.style.display = "block"; } // 关闭 // function closeToolPanel() { - ToolPanel.style.bottom = '-110%'; - ToolPanel.style.opacity = '0'; + ToolPanel.style.bottom = "-110%"; + ToolPanel.style.opacity = "0"; setTimeout(function () { - ToolPanel.style.display = 'none'; - ToolPanel.style.bottom = '0'; - ToolPanel.style.opacity = '1'; + ToolPanel.style.display = "none"; + ToolPanel.style.bottom = "0"; + ToolPanel.style.opacity = "1"; }, 500); } diff --git a/dev/js/tool.js b/dev/js/tool.js index b6b4408..a2cbec6 100644 --- a/dev/js/tool.js +++ b/dev/js/tool.js @@ -114,10 +114,10 @@ function toolUnixTimeSubmit() { // 按钮：重置 // function toolUnixTimeClear() { - document.getElementById("tool-unixtime-input-a").getElementsByTagName("input")[0].value = ''; // 清空输入框 A - document.getElementById("tool-unixtime-input-b").getElementsByTagName("input")[0].value = ''; // 清空输入框 B - document.getElementById("tool-unixtime-output-a").getElementsByTagName("input")[0].value = ''; // 清空输出框 A - document.getElementById("tool-unixtime-output-b").getElementsByTagName("input")[0].value = ''; // 清空输出框 B + document.querySelector("#tool-unixtime-input-a input").value = ''; // 清空输入框 A + document.querySelector("#tool-unixtime-input-b input").value = ''; // 清空输入框 B + document.querySelector("#tool-unixtime-output-a input").value = ''; // 清空输出框 A + document.querySelector("#tool-unixtime-output-b input").value = ''; // 清空输出框 B } /* ---- */ @@ -287,16 +287,39 @@ function toolGenLinkClear() { GetResult.placeholder = "结果"; } +/* -------------------- */ +/* 新窗口（小窗）中打开 */ +/* -------------------- */ + +function toolNewWindowSubmit() { + var link = document.querySelector("#tool-newwindow-link input").value; // 网址 + var width = document.querySelectorAll("#tool-newwindow-meta input")[0].value; // 宽度 + var height = document.querySelectorAll("#tool-newwindow-meta input")[1].value; // 高度 + if (width == "") { + width = 400; + } + if (height == "") { + height = 300; + } + window.open(link, "_blank", "height=" + height + ", width=" + width + ", toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=yes, status=yes"); +} + +function toolNewWindowClear() { + document.querySelector("#tool-newwindow-link input").value = ""; // 网址 + document.querySelectorAll("#tool-newwindow-meta input")[0].value = ""; // 宽度 + document.querySelectorAll("#tool-newwindow-meta input")[1].value = ""; // 高度 +} + /* --------------- */ /* 运行 JavaScript */ /* --------------- */ function toolRunJSSubmit() { - GetCode = document.getElementById("tool-runjs-input"); // 代码输入框 - eval(GetCode.value); // 运行 + var GetCode = document.querySelector("#tool-runjs-input"); // 代码输入框 + eval(GetCode.value); // 运行 } function toolRunJSClear() { - GetCode = document.getElementById("tool-runjs-input"); // 代码输入框 - GetCode.value = ''; // 清空 + var GetCode = document.querySelector("#tool-runjs-input"); // 代码输入框 + GetCode.value = ''; // 清空 } diff --git a/dev/tool.html b/dev/tool.html index 0bbddda..62bcb44 100644 --- a/dev/tool.html +++ b/dev/tool.html @@ -21,6 +21,7 @@
  • 计算下载用时
  • 简易计算
  • 生成批量下载链接
    • +
  • 新窗口（小窗）中打开
  • 运行 JavaScript
    • @@ -29,7 +30,7 @@
    Unix 时间戳转换
    -

    时间戳转换为北京时间

    +

    时间戳转换为北京时间

    Unix 时间戳： @@ -48,7 +49,7 @@
    -

    北京时间转换为时间戳

    +

    北京时间转换为时间戳

    时间： @@ -99,7 +100,7 @@
    简易计算
    - +
    保留小数点后 位数
    结果：
    计算
    @@ -109,7 +110,8 @@