From 6a2b05a62999e2a32b36da070dbe8447133b2ffc Mon Sep 17 00:00:00 2001 From: ccd0 Date: Fri, 17 Jun 2016 17:59:53 -0700 Subject: [PATCH] Make sure all shortcuts have IDs. #904 --- src/General/Header.coffee | 7 ++++--- src/General/Index.coffee | 4 ++-- src/General/Settings.coffee | 2 +- src/Images/FappeTyme.coffee | 5 ++--- src/Images/Gallery.coffee | 3 +-- src/Images/ImageExpand.coffee | 2 +- src/Monitoring/ThreadStats.coffee | 2 +- src/Monitoring/ThreadUpdater.coffee | 2 +- src/Monitoring/ThreadWatcher.coffee | 2 +- src/Posting/QR.coffee | 4 ++-- src/css/style.css | 4 ++-- 11 files changed, 18 insertions(+), 19 deletions(-) diff --git a/src/General/Header.coffee b/src/General/Header.coffee index 99994af79..abbcb18b0 100644 --- a/src/General/Header.coffee +++ b/src/General/Header.coffee @@ -55,7 +55,7 @@ Header = $.sync 'Centered links', @setLinkJustify $.sync 'Bottom Board List', @setFooterVisibility - @addShortcut menuButton, 900 + @addShortcut 'menu', menuButton, 900 @menu.addEntry el: $.el 'span', @@ -119,7 +119,7 @@ Header = cs.className = 'native-settings' $.on cs, 'click', () -> $.id('settingsWindowLink').click() - @addShortcut cs, 810 + @addShortcut 'native', cs, 810 @enableDesktopNotifications() @@ -495,8 +495,9 @@ Header = else top < 0 - addShortcut: (el, index) -> + addShortcut: (id, el, index) -> shortcut = $.el 'span', + id: "shortcut-#{id}" className: 'shortcut brackets-wrap' $.add shortcut, el shortcut.dataset.index = index diff --git a/src/General/Index.coffee b/src/General/Index.coffee index 631ec9746..3e75831ec 100644 --- a/src/General/Index.coffee +++ b/src/General/Index.coffee @@ -27,12 +27,12 @@ Index = # Header refresh button @button = $.el 'a', - className: 'index-refresh-shortcut fa fa-refresh' + className: 'fa fa-refresh' title: 'Refresh' href: 'javascript:;' textContent: 'Refresh Index' $.on @button, 'click', -> Index.update() - Header.addShortcut @button, 590 + Header.addShortcut 'index-refresh', @button, 590 # Header "Index Navigation" submenu repliesEntry = el: UI.checkbox 'Show Replies', 'Show replies' diff --git a/src/General/Settings.coffee b/src/General/Settings.coffee index b7a83cc21..36a66ec0f 100644 --- a/src/General/Settings.coffee +++ b/src/General/Settings.coffee @@ -8,7 +8,7 @@ Settings = href: 'javascript:;' $.on link, 'click', Settings.open - Header.addShortcut link, 820 + Header.addShortcut 'settings', link, 820 add = @addSection diff --git a/src/Images/FappeTyme.coffee b/src/Images/FappeTyme.coffee index 14831968a..8f84b920d 100644 --- a/src/Images/FappeTyme.coffee +++ b/src/Images/FappeTyme.coffee @@ -25,11 +25,10 @@ FappeTyme = textContent: type[0] title: "#{type} Tyme active" $.on indicator, 'click', -> - check = FappeTyme.nodes[@parentNode.id.split('-')[0]] + check = FappeTyme.nodes[@parentNode.id.replace('shortcut-', '')] check.checked = !check.checked $.event 'change', null, check - Header.addShortcut indicator, 410 - indicator.parentNode.id = "#{lc}-indicator" + Header.addShortcut lc, indicator, 410 if Conf['Werk Tyme'] $.sync 'werk', @set.bind(@, 'werk') diff --git a/src/Images/Gallery.coffee b/src/Images/Gallery.coffee index 0d9c3e9e6..dcbf6ad9c 100644 --- a/src/Images/Gallery.coffee +++ b/src/Images/Gallery.coffee @@ -6,14 +6,13 @@ Gallery = el = $.el 'a', href: 'javascript:;' - id: 'appchan-gal' title: 'Gallery' className: 'fa fa-picture-o' textContent: 'Gallery' $.on el, 'click', @cb.toggle - Header.addShortcut el, 530 + Header.addShortcut 'gallery', el, 530 Callbacks.Post.push name: 'Gallery' diff --git a/src/Images/ImageExpand.coffee b/src/Images/ImageExpand.coffee index 11d2a03fc..c28a951b3 100644 --- a/src/Images/ImageExpand.coffee +++ b/src/Images/ImageExpand.coffee @@ -9,7 +9,7 @@ ImageExpand = href: 'javascript:;' $.on @EAI, 'click', @cb.toggleAll - Header.addShortcut @EAI, 520 + Header.addShortcut 'expand-all', @EAI, 520 $.on d, 'scroll visibilitychange', @cb.playVideos @videoControls = $.el 'span', className: 'video-controls' $.extend @videoControls, <%= html(' contract') %> diff --git a/src/Monitoring/ThreadStats.coffee b/src/Monitoring/ThreadStats.coffee index 40e6f4d64..99f2f8940 100644 --- a/src/Monitoring/ThreadStats.coffee +++ b/src/Monitoring/ThreadStats.coffee @@ -16,7 +16,7 @@ ThreadStats = id: 'thread-stats' title: statsTitle $.extend sc, statsHTML - Header.addShortcut sc, 200 + Header.addShortcut 'stats', sc, 200 else @dialog = sc = UI.dialog 'thread-stats', 'bottom: 0px; right: 0px;', diff --git a/src/Monitoring/ThreadUpdater.coffee b/src/Monitoring/ThreadUpdater.coffee index 351145f7c..a49b2456e 100644 --- a/src/Monitoring/ThreadUpdater.coffee +++ b/src/Monitoring/ThreadUpdater.coffee @@ -12,7 +12,7 @@ ThreadUpdater = @dialog = sc = $.el 'span', id: 'updater' $.extend sc, <%= html('') %> - Header.addShortcut sc, 100 + Header.addShortcut 'updater', sc, 100 else @dialog = sc = UI.dialog 'updater', 'bottom: 0px; left: 0px;', <%= html('
') %> diff --git a/src/Monitoring/ThreadWatcher.coffee b/src/Monitoring/ThreadWatcher.coffee index 8201c75ee..bbef3f42b 100644 --- a/src/Monitoring/ThreadWatcher.coffee +++ b/src/Monitoring/ThreadWatcher.coffee @@ -36,7 +36,7 @@ ThreadWatcher = $.addClass doc, 'fixed-watcher' if Conf['Toggleable Thread Watcher'] @dialog.hidden = true - Header.addShortcut sc, 510 + Header.addShortcut 'watcher', sc, 510 $.addClass doc, 'toggleable-watcher' ThreadWatcher.fetchAuto() diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee index a742d8ee3..d4924a9d7 100644 --- a/src/Posting/QR.coffee +++ b/src/Posting/QR.coffee @@ -39,7 +39,7 @@ QR = if Conf['QR Shortcut'] @shortcut = sc = $.el 'a', - className: 'qr-shortcut fa fa-comment-o disabled' + className: 'fa fa-comment-o disabled' textContent: 'QR' title: 'Quick Reply' href: 'javascript:;' @@ -51,7 +51,7 @@ QR = else QR.close() - Header.addShortcut sc, 540 + Header.addShortcut 'qr', sc, 540 initReady: -> $.off d, '4chanXInitFinished', @initReady diff --git a/src/css/style.css b/src/css/style.css index 6415b2770..0086ba717 100644 --- a/src/css/style.css +++ b/src/css/style.css @@ -1139,8 +1139,8 @@ input[name="Default Volume"] { border-radius: 2px; cursor: pointer; } -:root:not(.fappeTyme) #fappe-indicator, -:root:not(.werkTyme) #werk-indicator { +:root:not(.fappeTyme) #shortcut-fappe, +:root:not(.werkTyme) #shortcut-werk { display: none; }