From 2909e88223a1692d930b9a3c0a8165ac111b0857 Mon Sep 17 00:00:00 2001
From: ccd0 <admin@containerchan.org>
Date: Wed, 27 Apr 2016 08:38:33 -0700
Subject: [PATCH] Bring back index argument for Header.addShortcut.

---
 src/General/Header.coffee           | 12 ++++++++----
 src/General/Index.coffee            |  2 +-
 src/General/Settings.coffee         |  2 +-
 src/Images/Gallery.coffee           |  2 +-
 src/Images/ImageExpand.coffee       |  2 +-
 src/Monitoring/ThreadStats.coffee   |  3 +--
 src/Monitoring/ThreadUpdater.coffee |  3 +--
 src/Monitoring/ThreadWatcher.coffee |  2 +-
 src/Posting/QR.coffee               |  2 +-
 9 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/General/Header.coffee b/src/General/Header.coffee
index 76ee8da9b..c4ddc9079 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
+    @addShortcut menuButton, 900
 
     @menu.addEntry
       el: $.el 'span',
@@ -119,7 +119,7 @@ Header =
           cs.className = 'fa fa-leaf'
         $.on cs, 'click', () ->
           $.id('settingsWindowLink').click()
-        @addShortcut cs
+        @addShortcut cs, 810
 
     @enableDesktopNotifications()
 
@@ -495,11 +495,15 @@ Header =
     else
       top < 0
 
-  addShortcut: (el) ->
+  addShortcut: (el, index) ->
     shortcut = $.el 'span',
       className: 'shortcut brackets-wrap'
     $.add shortcut, el
-    $.prepend Header.shortcuts, shortcut
+    shortcut.dataset.index = index
+    for item in $$('[data-index]', Header.shortcuts) when +item.dataset.index > +index
+      $.before item, shortcut
+      return
+    $.add Header.shortcuts, shortcut
 
   rmShortcut: (el) ->
     $.rm el.parentElement
diff --git a/src/General/Index.coffee b/src/General/Index.coffee
index 25687d0d6..00f8375d8 100644
--- a/src/General/Index.coffee
+++ b/src/General/Index.coffee
@@ -32,7 +32,7 @@ Index =
       href: 'javascript:;'
       textContent: 'Refresh Index'
     $.on @button, 'click', -> Index.update()
-    Header.addShortcut @button, 1
+    Header.addShortcut @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 d01367c05..bcc7e9076 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
+    Header.addShortcut link, 820
 
     add = @addSection
 
diff --git a/src/Images/Gallery.coffee b/src/Images/Gallery.coffee
index e5f8d7517..0d9c3e9e6 100644
--- a/src/Images/Gallery.coffee
+++ b/src/Images/Gallery.coffee
@@ -13,7 +13,7 @@ Gallery =
 
     $.on el, 'click', @cb.toggle
 
-    Header.addShortcut el
+    Header.addShortcut el, 530
 
     Callbacks.Post.push
       name: 'Gallery'
diff --git a/src/Images/ImageExpand.coffee b/src/Images/ImageExpand.coffee
index e33c57791..63fcc811f 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, 3
+    Header.addShortcut @EAI, 520
     $.on d, 'scroll visibilitychange', @cb.playVideos
     @videoControls = $.el 'span', className: 'video-controls'
     $.extend @videoControls, <%= html('\u00A0<a href="javascript:;" title="You can also contract the video by dragging it to the left.">contract</a>') %>
diff --git a/src/Monitoring/ThreadStats.coffee b/src/Monitoring/ThreadStats.coffee
index 216b0b22c..40e6f4d64 100644
--- a/src/Monitoring/ThreadStats.coffee
+++ b/src/Monitoring/ThreadStats.coffee
@@ -16,8 +16,7 @@ ThreadStats =
         id:    'thread-stats'
         title: statsTitle
       $.extend sc, statsHTML
-      $.ready ->
-        Header.addShortcut sc
+      Header.addShortcut 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 aac66a2bb..4ae272f7a 100644
--- a/src/Monitoring/ThreadUpdater.coffee
+++ b/src/Monitoring/ThreadUpdater.coffee
@@ -8,8 +8,7 @@ ThreadUpdater =
       @dialog = sc = $.el 'span',
         id:        'updater'
       $.extend sc, <%= html('<span id="update-status" class="empty"></span><span id="update-timer" class="empty" title="Update now"></span>') %>
-      $.ready ->
-        Header.addShortcut sc
+      Header.addShortcut sc, 100
     else
       @dialog = sc = UI.dialog 'updater', 'bottom: 0px; left: 0px;',
         <%= html('<div class="move"></div><span id="update-status"></span><span id="update-timer" title="Update now"></span>') %>
diff --git a/src/Monitoring/ThreadWatcher.coffee b/src/Monitoring/ThreadWatcher.coffee
index 1b6aebbb5..8201c75ee 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
+      Header.addShortcut sc, 510
       $.addClass doc, 'toggleable-watcher'
 
     ThreadWatcher.fetchAuto()
diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee
index 339ec6366..a7511b526 100644
--- a/src/Posting/QR.coffee
+++ b/src/Posting/QR.coffee
@@ -51,7 +51,7 @@ QR =
         else
           QR.close()
 
-      Header.addShortcut sc
+      Header.addShortcut sc, 540
 
   initReady: ->
     $.off d, '4chanXInitFinished', @initReady