Merge pull request #87 from gnehs/dev

Dev
gnehs · Oct 10, 2018 · 92d792f · 92d792f
2 parents 0eb449b + 106e2a1
commit 92d792f
Show file tree

Hide file tree

Showing 5 changed files with 198 additions and 160 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "pokaplayer",
-    "version": "0.12.4",
+    "version": "0.12.5",
     "description": "",
     "main": "index.js",
     "scripts": {

diff --git a/public/js/login.js b/public/js/login.js
@@ -1,7 +1,7 @@
 // 初始化網頁
 $(function() {
     var userPASS = window.localStorage["userPASS"]
-    if (userPASS) {
+    if (userPASS && userPASS != "false") {
         mdui.snackbar({
             message: '偵測到已儲存的密碼，正在嘗試登入',
             timeout: 1000

diff --git a/public/js/script.js b/public/js/script.js
@@ -53,8 +53,9 @@ router
         'now*': showNow,
         'lrc': showLrc,
         'settings': showSettings,
-        'settings/theme': showSettingsTheme,
-        'settings/pic': showSettingsPic,
+        'settings/network': showSettingsNetwork,
+        'settings/customize': showSettingsCustomize,
+        'settings/system': showSettingsSystem,
         'settings/about': showSettingsAbout,
         '*': showHome
     })