From c8c6228c077e1c422508b17be339bc05b9834d01 Mon Sep 17 00:00:00 2001 From: huangjx Date: Mon, 11 Oct 2021 22:43:27 +0800 Subject: [PATCH] fixed #11; --- src/css/style.scss | 24 ++++++++++++++++-------- src/inputAction.js | 4 +--- src/inputBox.js | 15 +++++++++++++-- 3 files changed, 30 insertions(+), 13 deletions(-) diff --git a/src/css/style.scss b/src/css/style.scss index 209d755..535cf02 100644 --- a/src/css/style.scss +++ b/src/css/style.scss @@ -7,14 +7,17 @@ a { text-decoration: none; } -#ncdownloader-form-wrapper .form-input-wrapper { - display : flex; - flex-flow: row nowrap; -} +#ncdownloader-form-wrapper { + margin-left: 2px; -#ncdownloader-form-wrapper .form-input-wrapper select, -#ncdownloader-form-wrapper .form-input-wrapper input { - justify-content: left; + .form-input-wrapper { + display : flex; + flex-flow: row nowrap; + + select input { + justify-content: left; + } + } } a:hover, @@ -118,12 +121,17 @@ div .number { } .app-ncdownloader, -#ncdownloader-content,.ncdownloader-content-wrapper,#ncdownloader-form-wrapper, #ncdownloader-table-content{ +#ncdownloader-content, +.ncdownloader-content-wrapper, +#ncdownloader-form-wrapper, +#ncdownloader-table-content { width: 100%; } + .ncdownloader-content-wrapper { padding-top: 0.3em; } + .app-ncdownloader #app-content #app-content-wrapper { flex-wrap: wrap; } diff --git a/src/inputAction.js b/src/inputAction.js index 95e04c6..a90528e 100644 --- a/src/inputAction.js +++ b/src/inputAction.js @@ -19,10 +19,9 @@ const createInputBox = (event, type) => { let height = $(window).scrollTop(); if (height > 50) $("html, body").animate({ scrollTop: 0 }, "fast"); - let name, path; + let name = t("ncdownloader", 'Download'), path; switch (type) { case "ytdl": - name = t("ncdownloader", 'YTDL Download'); path = basePath + "/youtube/new"; break; case "search": @@ -30,7 +29,6 @@ const createInputBox = (event, type) => { path = basePath + "/search"; break; default: - name = t("ncdownloader", 'New Download'); path = basePath + "/new"; } let container; diff --git a/src/inputBox.js b/src/inputBox.js index 8edf201..ca01601 100644 --- a/src/inputBox.js +++ b/src/inputBox.js @@ -83,14 +83,14 @@ class inputBox { let text = document.createTextNode(element.label); let span = document.createElement('span'); span.appendChild(text); - + let input = document.createElement('input'); input.setAttribute('type', 'checkbox'); input.setAttribute('id', element.id); input.setAttribute('value', 'off'); input.setAttribute('name', element.name || element.id); - label.setAttribute('for',element.id); + label.setAttribute('for', element.id); label.classList.add("checkbox-label"); label.appendChild(input); label.appendChild(span); @@ -124,6 +124,17 @@ class inputBox { textInput.setAttribute('data-type', id); textInput.setAttribute('value', ''); textInput.classList.add('form-input-text'); + switch (id) { + case 'general': + textInput.setAttribute('placeholder', t("ncdownloader",'Paste your magnet/http link here')); + break; + case 'ytdl': + textInput.setAttribute('placeholder', t("ncdownloader",'Paste your video link here')); + break; + case 'search': + textInput.setAttribute('placeholder', t("ncdownloader",'Enter your keyword to search')); + break; + } return textInput; } _createButton() {