Merge branch 'v3'

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

LICENSE

@@ -1,5 +1,5 @@
 /*
-* appchan x - Version 2.8.0 - 2014-01-11
+* appchan x - Version 2.8.0 - 2014-01-12
 *
 * Licensed under the MIT license.
 * https://github.com/zixaphir/appchan-x/blob/master/LICENSE

src/Archive/Redirect.coffee

@@ -17,7 +17,7 @@ Redirect =
 
     for boardID, record of Conf['selectedArchives']
       for type, id of record when (archive = archives[id])
-        boards = if type is 'file' then archive.file else archive.boards
+        boards = if type is 'file' then archive.files else archive.boards
         continue unless boardID in boards
         o[type][boardID] = archive.data
 

src/General/Settings.coffee

@@ -309,20 +309,20 @@ Settings =
     $.on $('input[name="Custom CSS"]', section), 'change', Settings.togglecss
     $.on $.id('apply-css'), 'click', Settings.usercss
 
-    boards = {}
-    for name, archive of Redirect.archives
-      for boardID in archive.boards
-        data = boards[boardID] or=
+    archBoards = {}
+    for {name, boards, files, data} in Redirect.archives
+      for boardID in boards
+        o = archBoards[boardID] or=
           thread: []
           post:   []
           file:   []
-        data.thread.push name
-        data.post.push   name if archive.software is 'foolfuuka'
-        data.file.push   name if boardID in archive.files
+        o.thread.push name
+        o.post.push   name if data.software is 'foolfuuka'
+        o.file.push   name if boardID in files
 
     rows = []
     boardOptions = []
-    for boardID in Object.keys(boards).sort() # Alphabetical order
+    for boardID in Object.keys(archBoards).sort() # Alphabetical order
       row = $.el 'tr',
         className: "board-#{boardID}"
       row.hidden = boardID isnt g.BOARD.ID
@@ -332,8 +332,8 @@ Settings =
         value:       "board-#{boardID}"
         selected:    boardID is g.BOARD.ID
 
-      data = boards[boardID]
-      $.add row, Settings.addArchiveCell boardID, data, item for item in ['thread', 'post', 'file']
+      o = archBoards[boardID]
+      $.add row, Settings.addArchiveCell boardID, o, item for item in ['thread', 'post', 'file']
       rows.push row
 
     $.add $('tbody', section), rows

src/General/html/Settings/Advanced.html

@@ -65,7 +65,7 @@
 </fieldset>
 
 <fieldset>
-  <legend>Quick Reply Personas <span class="warning" #{if Conf['Quick Reply'] then 'hidden' else ''}>is disabled.</span></legend>
+  <legend>Quick Reply Personas</legend>
   <textarea class=personafield name="QR.personas" class="field" spellcheck="false"></textarea>
   <p>
     One item per line.<br>