diff --git a/appinfo/info.xml b/appinfo/info.xml index 4eb5de1..860acf5 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -8,7 +8,7 @@ Search for torrents within the app from mutiple BT sites; Control Aria2 and manage download tasks from the web; download videos from 700+ video sites(youtube,youku,vimo,dailymotion,twitter,facebook and the likes - 0.7.0 + 0.7.1 agpl jiaxinhuang NCDownloader diff --git a/lib/Controller/MainController.php b/lib/Controller/MainController.php index 90e4c41..44e38c1 100644 --- a/lib/Controller/MainController.php +++ b/lib/Controller/MainController.php @@ -60,7 +60,8 @@ class MainController extends Controller $params['youtube_installed'] = $this->youtube->isInstalled(); $params['youtube_bin'] = $this->youtube->getBin(); $params['youtube_executable'] = $this->youtube->isExecutable(); - $params['ncd_hide_errors'] = $this->settings->get("ncd_hide_errors"); + $params['ncd_hide_errors'] = $this->settings->get("ncd_hide_errors",null); + $params['counter'] = $this->counters->getCounters(); $params['settings_url'] = $this->urlGenerator->linkToRoute("settings.PersonalSettings.index", ['section' => 'ncdownloader']); diff --git a/src/index.js b/src/index.js index 5338bb8..40dcd23 100644 --- a/src/index.js +++ b/src/index.js @@ -63,7 +63,7 @@ window.addEventListener('DOMContentLoaded', function () { eventHandler.add("click", "#app-navigation", "#search-download", helper.showDownload); eventHandler.add("change", "#app-navigation", "#ncd-hide-errors", e => { let data = {}; - data["ncd_hide_errors"] = e.target.checked === "true"; + data["ncd_hide_errors"] = e.target.checked; const url = helper.generateUrl(basePath + "/personal/save"); Http.getInstance(url).setData(data).setHandler(resp => { if (resp['message']) { diff --git a/src/utils/helper.js b/src/utils/helper.js index 553264b..b4bbf0b 100644 --- a/src/utils/helper.js +++ b/src/utils/helper.js @@ -182,9 +182,11 @@ const helper = { showErrors(target) { let errors = document.querySelectorAll(target); errors.forEach(element => { - helper.message(element.getAttribute('data-error-message'), 20000); + let msg; + if (msg = element.getAttribute('data-error-message')) + helper.message(msg, 20000); }) - } + }, } export default helper diff --git a/templates/Navigation.php b/templates/Navigation.php index f0e1c91..118ee8d 100644 --- a/templates/Navigation.php +++ b/templates/Navigation.php @@ -1,17 +1,22 @@
- - -
- + + +
+
@@ -27,7 +32,7 @@ if ($youtube_installed && !$youtube_executable) { - diff --git a/templates/settings/Settings.php b/templates/settings/Settings.php index 3a94028..10995bf 100644 --- a/templates/settings/Settings.php +++ b/templates/settings/Settings.php @@ -1,6 +1,7 @@