diff options
author | Kristian Lyngstol <kristian@bohemians.org> | 2016-05-22 14:41:09 +0200 |
---|---|---|
committer | Kristian Lyngstol <kristian@bohemians.org> | 2016-05-22 14:41:09 +0200 |
commit | 7123867297076d08a400a94774ef132a72f35496 (patch) | |
tree | 4a2963278dc9a8d81e9fbb25cf19377957ce5165 /web/js | |
parent | 83c43b691c639c115f9c99031eaafeb098dac69b (diff) |
Front: Further reduce tvmode-uniqueness
Still not very happy with this, but it's inching closer to acceptable every
day.
Should probably redo the whole set_handler() logic with regards to the
anchor to always use the views-logic where a comman-separated list is
acceptable, then get rid of nms.views all together.
Diffstat (limited to 'web/js')
-rw-r--r-- | web/js/nms.js | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/web/js/nms.js b/web/js/nms.js index a91493f..afcf8dd 100644 --- a/web/js/nms.js +++ b/web/js/nms.js @@ -49,8 +49,7 @@ var nms = { saveSettings(); }, - interval: 0, - tvmodeToggle: false, + interval: 10, views: "ping", /* * This is a list of nms[x] variables that we store in our @@ -59,7 +58,6 @@ var nms = { settingsList:[ 'nightMode', 'menuShowing', - 'tvmodeToggle', 'vertical', 'views', 'interval' @@ -564,19 +562,24 @@ function initNMS() { } function detectHandler() { - if (nms.tvmodeToggle) { - var views = nms.views; - var interval = nms.interval; - - views = views.split(","); - + var views = nms.views; + var interval = nms.interval; + views = views.split(","); + + if (views.length > 1) { nms.tvmode.start(views,interval); - return; } else { - for (var i in handlers) { - if (('#' + handlers[i].tag) == document.location.hash) { - setUpdater(handlers[i]); - return; + var anchorviews = document.location.hash.slice(1); + views = anchorviews.split(","); + if (views.length > 1) { + nms.tvmode.start(views,interval); + return; + } else { + for (var i in handlers) { + if (('#' + handlers[i].tag) == anchorviews) { + setUpdater(handlers[i]); + return; + } } } } |