Merge branch 'v3'

Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js

CHANGELOG.md

@@ -1,6 +1,12 @@
+**MayhemYDG**
+- Bugfixes.
+
 ### v2.9.19 
 *2014-04-19*
 
+**Zixaphir**
+- Bugfixes.
+
 ### v2.9.18 
 *2014-04-19*
 

LICENSE

@@ -1,5 +1,5 @@
 /*
-* appchan x - Version 2.9.19 - 2014-04-19
+* appchan x - Version 2.9.19 - 2014-04-20
 *
 * Licensed under the MIT license.
 * https://github.com/zixaphir/appchan-x/blob/master/LICENSE

css/style.css

@@ -105,7 +105,7 @@ a[href="javascript:;"] {
 :root.bottom-header body {
   margin-bottom: 2em;
 }
-body > .desktop,
+body > .desktop:not(#boardNavDesktop):not(#boardNavDesktopFoot),
 :root.fourchan-x #navtopright,
 :root.fourchan-x #navbotright,
 :root.fourchan-x:not(.show-original-top-board-list) #boardNavDesktop,

src/General/Build.coffee

@@ -228,6 +228,7 @@ Build =
     for quote in $$ '.quotelink', container
       href = quote.getAttribute 'href'
       continue if href[0] is '/' # Cross-board quote, or board link
+      href = "#{threadID}#{href}" if href[0] is '#'
       quote.href = "/#{boardID}/thread/#{href}" # Fix pathnames
 
     container

src/General/css/layout.css

@@ -823,7 +823,7 @@ nav a,
 /* From 4chan SS / OneeChan */
 <% if (type === 'userscript') { %>
 .fourchan-banner-reflection .boardBanner::after {
-  background-image: -moz-element(#Banner);
+  background-image: -moz-element(#bannerCnt);
   bottom: -100%;
   content: '';
   left: 0;
@@ -836,7 +836,7 @@ nav a,
   z-index: -1;
 }
 <% } else { %>
-.fourchan-banner-reflection #Banner {
+.fourchan-banner-reflection #bannerCnt {
   -webkit-box-reflect: below 0 -webkit-linear-gradient(rgba(255,255,255,0), rgba(255,255,255,0) 10%, rgba(255,255,255,.5));
 }
 <% } %>

src/Theming/Banner.coffee

@@ -10,24 +10,28 @@ Banner =
     {children} = banner
     nodes = []
 
-    i = 0
+    for child, i in children
-    while child = children[i++]
+      if i is 0
-      if i is 1
+        $.rm child
-        child.id    = "Banner"
+        img = $.el 'img',
-        child.title = "Click to change"
+          alt:   '4chan'
+          title: 'Click to change'
 
-        $.on child, 'click', Banner.cb.toggle
+        $.on img, 'click', Banner.cb.toggle
+        Banner.cb.toggle.call img
+
+        $.prepend banner, img
 
         continue
 
-      nodes.push child
-
       if Conf['Custom Board Titles']
-        Banner.custom(child).title = "Ctrl+click to edit board #{if i is 3
+        Banner.custom(child).title = "Ctrl+click to edit board #{if i is 2
           'sub'
         else
           ''}title"
 
+      nodes.push child
+
     $.add title, nodes
     $.after banner, title
     return
@@ -36,13 +40,13 @@ Banner =
     toggle: do ->
       types =
         jpg: 227
-        png: 270
+        png: 262
         gif: 253
 
       ->
         type = Object.keys(types)[Math.floor 3 * Math.random()]
         num  = Math.floor types[type] * Math.random()
-        @src = "//static.4chan.org/image/title/#{num}.#{type}"
+        @src = "//s.4cdn.org/image/title/#{num}.#{type}"
 
     click: (e) ->
       if e.ctrlKey