Merge

CHANGELOG.md

@@ -1,6 +1,6 @@
 seaweedchan:
 - Fix emoji and favicon previews not updating on change.
-- Fix issue with draggong thread watcher
+- Fix issue with dragging thread watcher
 - Fix some settings not importing when coming from Mayhem's v3
 
 MayhemYDG:
@@ -8,6 +8,9 @@ MayhemYDG:
 
 zixaphir:
 - Fix preview with favicons and emoji
+- Fix NaN error on Thread Updater Interval
+- Draggable UI can no longer overlap the Header.
+  -- Setting the header to Autohide also increases its z-index to overlap other UI
 
 ### 1.1.1 - 2013-04-26
 zixaphir:

src/General/UI.coffee

@@ -54,7 +54,7 @@ UI = do ->
       menu = @makeMenu()
       currentMenu       = menu
       lastToggledButton = button
-      
+
       @entries.sort (first, second) ->
         first.order - second.order
 
@@ -222,12 +222,18 @@ UI = do ->
       dy:     e.clientY - rect.top
       height: screenHeight - rect.height
       width:  screenWidth  - rect.width
-      topBorder:    if Conf["Bottom Header"] then 0 else Header.bar.getBoundingClientRect().height
-      bottomBorder: if Conf["Bottom Header"] then Header.bar.getBoundingClientRect().height else 0
       screenHeight: screenHeight
       screenWidth:  screenWidth
       isTouching:   isTouching
     }
+
+    [o.topBorder, o.bottomBorder] = if Conf['Header auto-hide']
+      [0, 0]
+    else if Conf['Bottom Header']
+      [0, Header.bar.getBoundingClientRect().height]
+    else
+      [Header.bar.getBoundingClientRect().height, 0]
+
     if isTouching
       o.identifier = e.identifier
       o.move = touchmove.bind o

src/General/css/style.css

@@ -87,6 +87,9 @@ a[href="javascript:;"] {
 #navlinks, #updater, #thread-stats {
   z-index: 40;
 }
+.fixed #header-bar.autohide {
+  z-index: 35;
+}
 #qr {
   z-index: 30;
 }

src/Miscellaneous/AnnouncementHiding.coffee

@@ -57,7 +57,7 @@ PSAHiding =
 
   sync: (hiddenPSAs) ->
     psa = $.id 'globalMessage'
-    psa.hidden = PSAHiding.btn.hidden = if PSAHiding.trim(psa) in hiddenPSAs
+    psa.hidden = PSAHiding.btn.hidden = if hiddenPSAs.contains PSAHiding.trim(psa)
       true 
     else
       false

src/Quotelinks/Quotify.coffee

@@ -64,7 +64,7 @@ Quotify =
         a.setAttribute 'data-boardid', boardID
         a.setAttribute 'data-postid',  postID
 
-    unless quoteID in @quotes
+    unless @quotes.contains quoteID
       @quotes.push quoteID
 
     unless a