Reorganization: Move stuff out of src/General.

Gruntfile.coffee

@@ -10,12 +10,12 @@ module.exports = (grunt) ->
 
   importCSS = (filenames...) ->
     grunt.template.process(
-      filenames.map((name) -> grunt.file.read "src/General/css/#{name}.css").join(''),
+      filenames.map((name) -> grunt.file.read "src/css/#{name}.css").join(''),
       {data: grunt.config 'pkg'}
     ).trim().replace(/\n+/g, '\n').split(/^/m).map(JSON.stringify).join(' +\n').replace(/`/g, '\\`')
 
   importHTML = (filename) ->
-    html grunt.template.process(grunt.file.read("src/General/html/#{filename}.html").replace(/^ +/gm, '').replace(/\r?\n/g, ''), data: grunt.config('pkg'))
+    html grunt.template.process(grunt.file.read("src/#{filename}.html").replace(/^ +/gm, '').replace(/\r?\n/g, ''), data: grunt.config('pkg'))
 
   parseTemplate = (template, context='') ->
     context0 = context
@@ -93,7 +93,21 @@ module.exports = (grunt) ->
         src: [
           'src/General/Config.coffee'
           'src/General/Globals.coffee'
-          'src/General/lib/*.coffee'
+          'src/General/$.coffee'
+          'src/classes/Callbacks.coffee'
+          'src/classes/Board.coffee'
+          'src/classes/Thread.coffee'
+          'src/classes/CatalogThread.coffee'
+          'src/classes/Post.coffee'
+          'src/classes/Clone.coffee'
+          'src/classes/DataBoard.coffee'
+          'src/classes/Notice.coffee'
+          'src/classes/RandomAccessList.coffee'
+          'src/classes/SimpleDict.coffee'
+          'src/classes/Set.coffee'
+          'src/classes/Connection.coffee'
+          'src/classes/Fetcher.coffee'
+          'src/General/Polyfill.coffee'
           'src/General/Header.coffee'
           'src/General/Index.coffee'
           'src/General/Build.coffee'
@@ -119,29 +133,29 @@ module.exports = (grunt) ->
         dest: 'tmp-<%= pkg.type %>/script.coffee'
       crx:
         files:
-          'testbuilds/updates<%= pkg.meta.suffix[pkg.channel] %>.xml': 'src/General/meta/updates.xml'
-          'testbuilds/crx<%= pkg.meta.suffix[pkg.channel] %>/manifest.json': 'src/General/meta/manifest.json'
+          'testbuilds/updates<%= pkg.meta.suffix[pkg.channel] %>.xml': 'src/meta/updates.xml'
+          'testbuilds/crx<%= pkg.meta.suffix[pkg.channel] %>/manifest.json': 'src/meta/manifest.json'
           'testbuilds/crx<%= pkg.meta.suffix[pkg.channel] %>/script.js': [
-            'src/General/meta/botproc.js'
+            'src/meta/botproc.js'
             'LICENSE'
-            'src/General/meta/usestrict.js'
+            'src/meta/usestrict.js'
             'tmp-<%= pkg.type %>/script.js'
           ]
           'testbuilds/crx<%= pkg.meta.suffix[pkg.channel] %>/eventPage.js': 'tmp-<%= pkg.type %>/eventPage.js'
       userscript:
         files:
-          'testbuilds/<%= pkg.name %><%= pkg.meta.suffix[pkg.channel] %>.meta.js': 'src/General/meta/metadata.js'
+          'testbuilds/<%= pkg.name %><%= pkg.meta.suffix[pkg.channel] %>.meta.js': 'src/meta/metadata.js'
           'testbuilds/<%= pkg.name %><%= pkg.meta.suffix[pkg.channel] %>.user.js': [
-            'src/General/meta/botproc.js'
-            'src/General/meta/metadata.js'
+            'src/meta/botproc.js'
+            'src/meta/metadata.js'
             'LICENSE'
-            'src/General/meta/usestrict.js'
+            'src/meta/usestrict.js'
             'tmp-<%= pkg.type %>/script.js'
           ]
 
     copy:
       crx:
-        src:  'src/General/img/*.png'
+        src:  'src/meta/*.png'
         dest: 'testbuilds/crx<%= pkg.meta.suffix[pkg.channel] %>/'
         expand:  true
         flatten: true
@@ -167,7 +181,7 @@ module.exports = (grunt) ->
         src:  'tmp-<%= pkg.type %>/script.coffee'
         dest: 'tmp-<%= pkg.type %>/script.js'
       eventPage:
-        src:  'src/General/eventPage/eventPage.coffee'
+        src:  'src/General/eventPage.coffee'
         dest: 'tmp-<%= pkg.type %>/eventPage.js'
 
     concurrent:

src/General/Build.coffee

@@ -115,7 +115,7 @@ Build =
     else
       "/#{boardID}/thread/#{threadID}#q#{postID}"
 
-    postInfo = <%= importHTML('Build/PostInfo') %>
+    postInfo = <%= importHTML('General/Build/PostInfo') %>
 
     ### File Info ###
 
@@ -125,13 +125,13 @@ Build =
       shortFilename = Build.shortFilename file.name
       fileThumb = if file.isSpoiler then Build.spoilerThumb(boardID) else file.thumbURL.replace(protocol, '')
 
-    fileBlock = <%= importHTML('Build/File') %>
+    fileBlock = <%= importHTML('General/Build/File') %>
 
     ### Whole Post ###
 
     postClass = if o.isReply then 'reply' else 'op'
 
-    wholePost = <%= importHTML('Build/Post') %>
+    wholePost = <%= importHTML('General/Build/Post') %>
 
     container = $.el 'div',
       className: "postContainer #{postClass}Container"
@@ -218,7 +218,7 @@ Build =
     root = $.el 'div',
       className: 'catalog-thread'
 
-    $.extend root, <%= importHTML('Build/CatalogThread') %>
+    $.extend root, <%= importHTML('General/Build/CatalogThread') %>
 
     root.dataset.fullID = thread.fullID
     $.addClass root, thread.OP.highlights... if thread.OP.highlights

src/General/Index.coffee

@@ -53,10 +53,10 @@ Index =
     @root     = $.el 'div', className: 'board'
     @cb.size()
     @pagelist = $.el 'div', className: 'pagelist'
-    $.extend @pagelist, <%= importHTML('Features/Index-pagelist') %>
+    $.extend @pagelist, <%= importHTML('General/Index/PageList') %>
     $('.cataloglink a', @pagelist).href = CatalogLinks.catalog()
     @navLinks = $.el 'div', className: 'navLinks'
-    $.extend @navLinks, <%= importHTML('Features/Index-navlinks') %>
+    $.extend @navLinks, <%= importHTML('General/Index/NavLinks') %>
     $('.cataloglink a', @navLinks).href = CatalogLinks.catalog()
     $('.archlistlink', @navLinks).hidden = true if g.BOARD.ID in ['b', 'trash']
     @searchInput = $ '#index-search', @navLinks

src/General/Settings.coffee

@@ -38,7 +38,7 @@ Settings =
     Settings.dialog = dialog = $.el 'div',
       id:        'fourchanx-settings'
       className: 'dialog'
-    $.extend dialog, <%= importHTML('Settings/Settings') %>
+    $.extend dialog, <%= importHTML('General/Settings/Settings') %>
 
     Settings.overlay = overlay = $.el 'div',
       id: 'overlay'
@@ -317,7 +317,7 @@ Settings =
           window.location.reload()
 
   filter: (section) ->
-    $.extend section, <%= importHTML('Settings/Filter-select') %>
+    $.extend section, <%= importHTML('General/Settings/Filter-select') %>
     select = $ 'select', section
     $.on select, 'change', Settings.selectFilter
     Settings.selectFilter.call select
@@ -335,11 +335,11 @@ Settings =
       $.on ta, 'change', $.cb.value
       $.add div, ta
       return
-    $.extend div, <%= importHTML('Settings/Filter-guide') %>
+    $.extend div, <%= importHTML('General/Settings/Filter-guide') %>
     $('.warning', div).hidden = Conf['Filter']
 
   sauce: (section) ->
-    $.extend section, <%= importHTML('Settings/Sauce') %>
+    $.extend section, <%= importHTML('General/Settings/Sauce') %>
     $('.warning', section).hidden = Conf['Sauce']
     ta = $ 'textarea', section
     $.get 'sauces', Conf['sauces'], (item) ->
@@ -347,7 +347,7 @@ Settings =
     $.on ta, 'change', $.cb.value
 
   advanced: (section) ->
-    $.extend section, <%= importHTML('Settings/Advanced') %>
+    $.extend section, <%= importHTML('General/Settings/Advanced') %>
     warning.hidden = Conf[warning.dataset.feature] for warning in $$ '.warning', section
 
     items = {}
@@ -524,7 +524,7 @@ Settings =
     CustomCSS.update()
 
   keybinds: (section) ->
-    $.extend section, <%= importHTML('Settings/Keybinds') %>
+    $.extend section, <%= importHTML('General/Settings/Keybinds') %>
     $('.warning', section).hidden = Conf['Keybinds']
 
     tbody  = $ 'tbody', section

src/General/lib/classes.coffee

@@ -1,13 +0,0 @@
-<%= grunt.file.read('src/General/lib/callbacks.class') %>
-<%= grunt.file.read('src/General/lib/board.class') %>
-<%= grunt.file.read('src/General/lib/thread.class') %>
-<%= grunt.file.read('src/General/lib/catalogthread.class') %>
-<%= grunt.file.read('src/General/lib/post.class') %>
-<%= grunt.file.read('src/General/lib/clone.class') %>
-<%= grunt.file.read('src/General/lib/databoard.class') %>
-<%= grunt.file.read('src/General/lib/notice.class') %>
-<%= grunt.file.read('src/General/lib/randomaccesslist.class') %>
-<%= grunt.file.read('src/General/lib/simpledict.class') %>
-<%= grunt.file.read('src/General/lib/set.class') %>
-<%= grunt.file.read('src/General/lib/connection.class') %>
-<%= grunt.file.read('src/General/lib/fetcher.class') %>

src/Images/Gallery.coffee

@@ -44,7 +44,7 @@ Gallery =
 
     nodes.el = dialog = $.el 'div',
       id: 'a-gallery'
-    $.extend dialog, <%= importHTML('Features/Gallery') %>
+    $.extend dialog, <%= importHTML('Images/Gallery') %>
 
     nodes[key] = $ value, dialog for key, value of {
       buttons: '.gal-buttons'

src/Images/Sauce.coffee

@@ -19,7 +19,7 @@ Sauce =
       cb:   @node
 
   sandbox: (url) ->
-    E.url <%= importHTML('Features/Sandbox') %>
+    E.url <%= importHTML('Images/Sandbox') %>
 
   rmOrigin: (e) ->
     return if e.shiftKey or e.altKey or e.ctrlKey or e.metaKey or e.button isnt 0

src/Linkification/Embedding.coffee

@@ -6,7 +6,7 @@ Embedding =
 
     if Conf['Floating Embeds']
       @dialog = UI.dialog 'embedding', 'top: 50px; right: 0px;',
-        <%= importHTML('Features/Embed') %>
+        <%= importHTML('Linkification/Embed') %>
       @media = $ '#media-embed', @dialog
       $.one d, '4chanXInitFinished', @ready
 

src/Monitoring/Favicon.coffee

@@ -12,52 +12,52 @@ Favicon =
   switch: ->
     items = {
       ferongr: [
-        '<%= grunt.file.read("src/General/img/favicons/ferongr/unreadDead.png",   {encoding: "base64"}) %>'
-        '<%= grunt.file.read("src/General/img/favicons/ferongr/unreadDeadY.png",  {encoding: "base64"}) %>'
-        '<%= grunt.file.read("src/General/img/favicons/ferongr/unreadSFW.png",    {encoding: "base64"}) %>'
-        '<%= grunt.file.read("src/General/img/favicons/ferongr/unreadSFWY.png",   {encoding: "base64"}) %>'
-        '<%= grunt.file.read("src/General/img/favicons/ferongr/unreadNSFW.png",   {encoding: "base64"}) %>'
-        '<%= grunt.file.read("src/General/img/favicons/ferongr/unreadNSFWY.png",  {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/ferongr/unreadDead.png",   {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/ferongr/unreadDeadY.png",  {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/ferongr/unreadSFW.png",    {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/ferongr/unreadSFWY.png",   {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/ferongr/unreadNSFW.png",   {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/ferongr/unreadNSFWY.png",  {encoding: "base64"}) %>'
       ]
       'xat-': [
-        '<%= grunt.file.read("src/General/img/favicons/xat-/unreadDead.png",      {encoding: "base64"}) %>'
-        '<%= grunt.file.read("src/General/img/favicons/xat-/unreadDeadY.png",     {encoding: "base64"}) %>'
-        '<%= grunt.file.read("src/General/img/favicons/xat-/unreadSFW.png",       {encoding: "base64"}) %>'
-        '<%= grunt.file.read("src/General/img/favicons/xat-/unreadSFWY.png",      {encoding: "base64"}) %>'
-        '<%= grunt.file.read("src/General/img/favicons/xat-/unreadNSFW.png",      {encoding: "base64"}) %>'
-        '<%= grunt.file.read("src/General/img/favicons/xat-/unreadNSFWY.png",     {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/xat-/unreadDead.png",      {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/xat-/unreadDeadY.png",     {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/xat-/unreadSFW.png",       {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/xat-/unreadSFWY.png",      {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/xat-/unreadNSFW.png",      {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/xat-/unreadNSFWY.png",     {encoding: "base64"}) %>'
       ]
       Mayhem: [
-        '<%= grunt.file.read("src/General/img/favicons/Mayhem/unreadDead.png",    {encoding: "base64"}) %>'
-        '<%= grunt.file.read("src/General/img/favicons/Mayhem/unreadDeadY.png",   {encoding: "base64"}) %>'
-        '<%= grunt.file.read("src/General/img/favicons/Mayhem/unreadSFW.png",     {encoding: "base64"}) %>'
-        '<%= grunt.file.read("src/General/img/favicons/Mayhem/unreadSFWY.png",    {encoding: "base64"}) %>'
-        '<%= grunt.file.read("src/General/img/favicons/Mayhem/unreadNSFW.png",    {encoding: "base64"}) %>'
-        '<%= grunt.file.read("src/General/img/favicons/Mayhem/unreadNSFWY.png",   {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/Mayhem/unreadDead.png",    {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/Mayhem/unreadDeadY.png",   {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/Mayhem/unreadSFW.png",     {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/Mayhem/unreadSFWY.png",    {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/Mayhem/unreadNSFW.png",    {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/Mayhem/unreadNSFWY.png",   {encoding: "base64"}) %>'
       ]
       '4chanJS': [
-        '<%= grunt.file.read("src/General/img/favicons/4chanJS/unreadDead.png",   {encoding: "base64"}) %>'
-        '<%= grunt.file.read("src/General/img/favicons/4chanJS/unreadDeadY.png",  {encoding: "base64"}) %>'
-        '<%= grunt.file.read("src/General/img/favicons/4chanJS/unreadSFW.png",    {encoding: "base64"}) %>'
-        '<%= grunt.file.read("src/General/img/favicons/4chanJS/unreadSFWY.png",   {encoding: "base64"}) %>'
-        '<%= grunt.file.read("src/General/img/favicons/4chanJS/unreadNSFW.png",   {encoding: "base64"}) %>'
-        '<%= grunt.file.read("src/General/img/favicons/4chanJS/unreadNSFWY.png",  {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/4chanJS/unreadDead.png",   {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/4chanJS/unreadDeadY.png",  {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/4chanJS/unreadSFW.png",    {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/4chanJS/unreadSFWY.png",   {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/4chanJS/unreadNSFW.png",   {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/4chanJS/unreadNSFWY.png",  {encoding: "base64"}) %>'
       ]
       Original: [
-        '<%= grunt.file.read("src/General/img/favicons/Original/unreadDead.png",  {encoding: "base64"}) %>'
-        '<%= grunt.file.read("src/General/img/favicons/Original/unreadDeadY.png", {encoding: "base64"}) %>'
-        '<%= grunt.file.read("src/General/img/favicons/Original/unreadSFW.png",   {encoding: "base64"}) %>'
-        '<%= grunt.file.read("src/General/img/favicons/Original/unreadSFWY.png",  {encoding: "base64"}) %>'
-        '<%= grunt.file.read("src/General/img/favicons/Original/unreadNSFW.png",  {encoding: "base64"}) %>'
-        '<%= grunt.file.read("src/General/img/favicons/Original/unreadNSFWY.png", {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/Original/unreadDead.png",  {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/Original/unreadDeadY.png", {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/Original/unreadSFW.png",   {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/Original/unreadSFWY.png",  {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/Original/unreadNSFW.png",  {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/Original/unreadNSFWY.png", {encoding: "base64"}) %>'
       ]
       'Metro': [
-        '<%= grunt.file.read("src/General/img/favicons/Metro/unreadDead.png",     {encoding: "base64"}) %>'
-        '<%= grunt.file.read("src/General/img/favicons/Metro/unreadDeadY.png",    {encoding: "base64"}) %>'
-        '<%= grunt.file.read("src/General/img/favicons/Metro/unreadSFW.png",      {encoding: "base64"}) %>'
-        '<%= grunt.file.read("src/General/img/favicons/Metro/unreadSFWY.png",     {encoding: "base64"}) %>'
-        '<%= grunt.file.read("src/General/img/favicons/Metro/unreadNSFW.png",     {encoding: "base64"}) %>'
-        '<%= grunt.file.read("src/General/img/favicons/Metro/unreadNSFWY.png",    {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/Metro/unreadDead.png",     {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/Metro/unreadDeadY.png",    {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/Metro/unreadSFW.png",      {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/Metro/unreadSFWY.png",     {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/Metro/unreadNSFW.png",     {encoding: "base64"}) %>'
+        '<%= grunt.file.read("src/Monitoring/Favicon/Metro/unreadNSFWY.png",    {encoding: "base64"}) %>'
       ]
     }[Conf['favicon']]
 
@@ -78,5 +78,5 @@ Favicon =
       @unread  = @unreadNSFW
       @unreadY = @unreadNSFWY
 
-  dead:  'data:image/gif;base64,<%= grunt.file.read("src/General/img/favicons/dead.gif", {encoding: "base64"}) %>'
-  logo:  'data:image/png;base64,<%= grunt.file.read("src/General/img/icon128.png",       {encoding: "base64"}) %>'
+  dead:  'data:image/gif;base64,<%= grunt.file.read("src/Monitoring/Favicon/dead.gif", {encoding: "base64"}) %>'
+  logo:  'data:image/png;base64,<%= grunt.file.read("src/meta/icon128.png",       {encoding: "base64"}) %>'

src/Monitoring/ThreadUpdater.coffee

@@ -88,7 +88,7 @@ ThreadUpdater =
   http://freesound.org/people/pierrecartoons1979/sounds/90112/
   cc-by-nc-3.0
   ###
-  beep: 'data:audio/wav;base64,<%= grunt.file.read("src/General/audio/beep.wav", {encoding: "base64"}) %>'
+  beep: 'data:audio/wav;base64,<%= grunt.file.read("src/Monitoring/beep.wav", {encoding: "base64"}) %>'
 
   cb:
     checkpost: (e) ->

src/Posting/QR.coffee

@@ -439,7 +439,7 @@ QR =
   dialog: ->
     QR.nodes = nodes =
       el: dialog = UI.dialog 'qr', 'top: 50px; right: 0px;',
-        <%= importHTML('Features/QuickReply') %>
+        <%= importHTML('Posting/QuickReply') %>
 
     setNode = (name, query) ->
       nodes[name] = $ query, dialog