diff --git a/Gruntfile.coffee b/Gruntfile.coffee index 677d7ea70..71aa46977 100755 --- a/Gruntfile.coffee +++ b/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: diff --git a/src/General/lib/$.coffee b/src/General/$.coffee similarity index 100% rename from src/General/lib/$.coffee rename to src/General/$.coffee diff --git a/src/General/Build.coffee b/src/General/Build.coffee index c004d6692..e82c60a0f 100755 --- a/src/General/Build.coffee +++ b/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 diff --git a/src/General/html/Build/CatalogThread.html b/src/General/Build/CatalogThread.html similarity index 100% rename from src/General/html/Build/CatalogThread.html rename to src/General/Build/CatalogThread.html diff --git a/src/General/html/Build/File.html b/src/General/Build/File.html similarity index 100% rename from src/General/html/Build/File.html rename to src/General/Build/File.html diff --git a/src/General/html/Build/Post.html b/src/General/Build/Post.html similarity index 100% rename from src/General/html/Build/Post.html rename to src/General/Build/Post.html diff --git a/src/General/html/Build/PostInfo.html b/src/General/Build/PostInfo.html similarity index 100% rename from src/General/html/Build/PostInfo.html rename to src/General/Build/PostInfo.html diff --git a/src/General/Index.coffee b/src/General/Index.coffee index 48fe6458a..df6d138d7 100644 --- a/src/General/Index.coffee +++ b/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 diff --git a/src/General/html/Features/Index-navlinks.html b/src/General/Index/NavLinks.html similarity index 100% rename from src/General/html/Features/Index-navlinks.html rename to src/General/Index/NavLinks.html diff --git a/src/General/html/Features/Index-pagelist.html b/src/General/Index/PageList.html similarity index 100% rename from src/General/html/Features/Index-pagelist.html rename to src/General/Index/PageList.html diff --git a/src/General/lib/polyfill.coffee b/src/General/Polyfill.coffee similarity index 100% rename from src/General/lib/polyfill.coffee rename to src/General/Polyfill.coffee diff --git a/src/General/Settings.coffee b/src/General/Settings.coffee index d4b1c1c2e..8d2c39ce0 100755 --- a/src/General/Settings.coffee +++ b/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 diff --git a/src/General/html/Settings/Advanced.html b/src/General/Settings/Advanced.html similarity index 100% rename from src/General/html/Settings/Advanced.html rename to src/General/Settings/Advanced.html diff --git a/src/General/html/Settings/Filter-guide.html b/src/General/Settings/Filter-guide.html similarity index 100% rename from src/General/html/Settings/Filter-guide.html rename to src/General/Settings/Filter-guide.html diff --git a/src/General/html/Settings/Filter-select.html b/src/General/Settings/Filter-select.html similarity index 100% rename from src/General/html/Settings/Filter-select.html rename to src/General/Settings/Filter-select.html diff --git a/src/General/html/Settings/Keybinds.html b/src/General/Settings/Keybinds.html similarity index 100% rename from src/General/html/Settings/Keybinds.html rename to src/General/Settings/Keybinds.html diff --git a/src/General/html/Settings/Sauce.html b/src/General/Settings/Sauce.html similarity index 100% rename from src/General/html/Settings/Sauce.html rename to src/General/Settings/Sauce.html diff --git a/src/General/html/Settings/Settings.html b/src/General/Settings/Settings.html similarity index 100% rename from src/General/html/Settings/Settings.html rename to src/General/Settings/Settings.html diff --git a/src/General/eventPage/eventPage.coffee b/src/General/eventPage.coffee similarity index 100% rename from src/General/eventPage/eventPage.coffee rename to src/General/eventPage.coffee diff --git a/src/General/lib/classes.coffee b/src/General/lib/classes.coffee deleted file mode 100755 index e89bd4a04..000000000 --- a/src/General/lib/classes.coffee +++ /dev/null @@ -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') %> diff --git a/src/Images/Gallery.coffee b/src/Images/Gallery.coffee index f925e2a6c..8bf5a15ed 100644 --- a/src/Images/Gallery.coffee +++ b/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' diff --git a/src/General/html/Features/Gallery.html b/src/Images/Gallery.html similarity index 100% rename from src/General/html/Features/Gallery.html rename to src/Images/Gallery.html diff --git a/src/General/html/Features/Sandbox.html b/src/Images/Sandbox.html similarity index 100% rename from src/General/html/Features/Sandbox.html rename to src/Images/Sandbox.html diff --git a/src/Images/Sauce.coffee b/src/Images/Sauce.coffee index 7d6f9e64c..68c7f4669 100755 --- a/src/Images/Sauce.coffee +++ b/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 diff --git a/src/General/html/Features/Embed.html b/src/Linkification/Embed.html similarity index 100% rename from src/General/html/Features/Embed.html rename to src/Linkification/Embed.html diff --git a/src/Linkification/Embedding.coffee b/src/Linkification/Embedding.coffee index 934458062..cd383f4e8 100644 --- a/src/Linkification/Embedding.coffee +++ b/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 diff --git a/src/General/img/links/audio.png b/src/Linkification/icons/audio.png similarity index 100% rename from src/General/img/links/audio.png rename to src/Linkification/icons/audio.png diff --git a/src/General/img/links/gfycat.png b/src/Linkification/icons/gfycat.png similarity index 100% rename from src/General/img/links/gfycat.png rename to src/Linkification/icons/gfycat.png diff --git a/src/General/img/links/gist.png b/src/Linkification/icons/gist.png similarity index 100% rename from src/General/img/links/gist.png rename to src/Linkification/icons/gist.png diff --git a/src/General/img/links/image.png b/src/Linkification/icons/image.png similarity index 100% rename from src/General/img/links/image.png rename to src/Linkification/icons/image.png diff --git a/src/General/img/links/installgentoo.png b/src/Linkification/icons/installgentoo.png similarity index 100% rename from src/General/img/links/installgentoo.png rename to src/Linkification/icons/installgentoo.png diff --git a/src/General/img/links/liveleak.png b/src/Linkification/icons/liveleak.png similarity index 100% rename from src/General/img/links/liveleak.png rename to src/Linkification/icons/liveleak.png diff --git a/src/General/img/links/pastebin.png b/src/Linkification/icons/pastebin.png similarity index 100% rename from src/General/img/links/pastebin.png rename to src/Linkification/icons/pastebin.png diff --git a/src/General/img/links/soundcloud.png b/src/Linkification/icons/soundcloud.png similarity index 100% rename from src/General/img/links/soundcloud.png rename to src/Linkification/icons/soundcloud.png diff --git a/src/General/img/links/video.png b/src/Linkification/icons/video.png similarity index 100% rename from src/General/img/links/video.png rename to src/Linkification/icons/video.png diff --git a/src/General/img/links/vimeo.png b/src/Linkification/icons/vimeo.png similarity index 100% rename from src/General/img/links/vimeo.png rename to src/Linkification/icons/vimeo.png diff --git a/src/General/img/links/vocaroo.png b/src/Linkification/icons/vocaroo.png similarity index 100% rename from src/General/img/links/vocaroo.png rename to src/Linkification/icons/vocaroo.png diff --git a/src/General/img/links/youtube.png b/src/Linkification/icons/youtube.png similarity index 100% rename from src/General/img/links/youtube.png rename to src/Linkification/icons/youtube.png diff --git a/src/Monitoring/Favicon.coffee b/src/Monitoring/Favicon.coffee index efcb055c1..48e32fa65 100755 --- a/src/Monitoring/Favicon.coffee +++ b/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"}) %>' diff --git a/src/General/img/favicons/4chanJS/unreadDead.png b/src/Monitoring/Favicon/4chanJS/unreadDead.png similarity index 100% rename from src/General/img/favicons/4chanJS/unreadDead.png rename to src/Monitoring/Favicon/4chanJS/unreadDead.png diff --git a/src/General/img/favicons/4chanJS/unreadDeadY.png b/src/Monitoring/Favicon/4chanJS/unreadDeadY.png similarity index 100% rename from src/General/img/favicons/4chanJS/unreadDeadY.png rename to src/Monitoring/Favicon/4chanJS/unreadDeadY.png diff --git a/src/General/img/favicons/4chanJS/unreadNSFW.png b/src/Monitoring/Favicon/4chanJS/unreadNSFW.png similarity index 100% rename from src/General/img/favicons/4chanJS/unreadNSFW.png rename to src/Monitoring/Favicon/4chanJS/unreadNSFW.png diff --git a/src/General/img/favicons/4chanJS/unreadNSFWY.png b/src/Monitoring/Favicon/4chanJS/unreadNSFWY.png similarity index 100% rename from src/General/img/favicons/4chanJS/unreadNSFWY.png rename to src/Monitoring/Favicon/4chanJS/unreadNSFWY.png diff --git a/src/General/img/favicons/4chanJS/unreadSFW.png b/src/Monitoring/Favicon/4chanJS/unreadSFW.png similarity index 100% rename from src/General/img/favicons/4chanJS/unreadSFW.png rename to src/Monitoring/Favicon/4chanJS/unreadSFW.png diff --git a/src/General/img/favicons/4chanJS/unreadSFWY.png b/src/Monitoring/Favicon/4chanJS/unreadSFWY.png similarity index 100% rename from src/General/img/favicons/4chanJS/unreadSFWY.png rename to src/Monitoring/Favicon/4chanJS/unreadSFWY.png diff --git a/src/General/img/favicons/Mayhem/unreadDead.png b/src/Monitoring/Favicon/Mayhem/unreadDead.png similarity index 100% rename from src/General/img/favicons/Mayhem/unreadDead.png rename to src/Monitoring/Favicon/Mayhem/unreadDead.png diff --git a/src/General/img/favicons/Mayhem/unreadDeadY.png b/src/Monitoring/Favicon/Mayhem/unreadDeadY.png similarity index 100% rename from src/General/img/favicons/Mayhem/unreadDeadY.png rename to src/Monitoring/Favicon/Mayhem/unreadDeadY.png diff --git a/src/General/img/favicons/Mayhem/unreadNSFW.png b/src/Monitoring/Favicon/Mayhem/unreadNSFW.png similarity index 100% rename from src/General/img/favicons/Mayhem/unreadNSFW.png rename to src/Monitoring/Favicon/Mayhem/unreadNSFW.png diff --git a/src/General/img/favicons/Mayhem/unreadNSFWY.png b/src/Monitoring/Favicon/Mayhem/unreadNSFWY.png similarity index 100% rename from src/General/img/favicons/Mayhem/unreadNSFWY.png rename to src/Monitoring/Favicon/Mayhem/unreadNSFWY.png diff --git a/src/General/img/favicons/Mayhem/unreadSFW.png b/src/Monitoring/Favicon/Mayhem/unreadSFW.png similarity index 100% rename from src/General/img/favicons/Mayhem/unreadSFW.png rename to src/Monitoring/Favicon/Mayhem/unreadSFW.png diff --git a/src/General/img/favicons/Mayhem/unreadSFWY.png b/src/Monitoring/Favicon/Mayhem/unreadSFWY.png similarity index 100% rename from src/General/img/favicons/Mayhem/unreadSFWY.png rename to src/Monitoring/Favicon/Mayhem/unreadSFWY.png diff --git a/src/General/img/favicons/Metro/readNSFW.png b/src/Monitoring/Favicon/Metro/readNSFW.png similarity index 100% rename from src/General/img/favicons/Metro/readNSFW.png rename to src/Monitoring/Favicon/Metro/readNSFW.png diff --git a/src/General/img/favicons/Metro/readSFW.png b/src/Monitoring/Favicon/Metro/readSFW.png similarity index 100% rename from src/General/img/favicons/Metro/readSFW.png rename to src/Monitoring/Favicon/Metro/readSFW.png diff --git a/src/General/img/favicons/Metro/unreadDead.png b/src/Monitoring/Favicon/Metro/unreadDead.png similarity index 100% rename from src/General/img/favicons/Metro/unreadDead.png rename to src/Monitoring/Favicon/Metro/unreadDead.png diff --git a/src/General/img/favicons/Metro/unreadDeadY.png b/src/Monitoring/Favicon/Metro/unreadDeadY.png similarity index 100% rename from src/General/img/favicons/Metro/unreadDeadY.png rename to src/Monitoring/Favicon/Metro/unreadDeadY.png diff --git a/src/General/img/favicons/Metro/unreadNSFW.png b/src/Monitoring/Favicon/Metro/unreadNSFW.png similarity index 100% rename from src/General/img/favicons/Metro/unreadNSFW.png rename to src/Monitoring/Favicon/Metro/unreadNSFW.png diff --git a/src/General/img/favicons/Metro/unreadNSFWY.png b/src/Monitoring/Favicon/Metro/unreadNSFWY.png similarity index 100% rename from src/General/img/favicons/Metro/unreadNSFWY.png rename to src/Monitoring/Favicon/Metro/unreadNSFWY.png diff --git a/src/General/img/favicons/Metro/unreadSFW.png b/src/Monitoring/Favicon/Metro/unreadSFW.png similarity index 100% rename from src/General/img/favicons/Metro/unreadSFW.png rename to src/Monitoring/Favicon/Metro/unreadSFW.png diff --git a/src/General/img/favicons/Metro/unreadSFWY.png b/src/Monitoring/Favicon/Metro/unreadSFWY.png similarity index 100% rename from src/General/img/favicons/Metro/unreadSFWY.png rename to src/Monitoring/Favicon/Metro/unreadSFWY.png diff --git a/src/General/img/favicons/Original/unreadDead.png b/src/Monitoring/Favicon/Original/unreadDead.png similarity index 100% rename from src/General/img/favicons/Original/unreadDead.png rename to src/Monitoring/Favicon/Original/unreadDead.png diff --git a/src/General/img/favicons/Original/unreadDeadY.png b/src/Monitoring/Favicon/Original/unreadDeadY.png similarity index 100% rename from src/General/img/favicons/Original/unreadDeadY.png rename to src/Monitoring/Favicon/Original/unreadDeadY.png diff --git a/src/General/img/favicons/Original/unreadNSFW.png b/src/Monitoring/Favicon/Original/unreadNSFW.png similarity index 100% rename from src/General/img/favicons/Original/unreadNSFW.png rename to src/Monitoring/Favicon/Original/unreadNSFW.png diff --git a/src/General/img/favicons/Original/unreadNSFWY.png b/src/Monitoring/Favicon/Original/unreadNSFWY.png similarity index 100% rename from src/General/img/favicons/Original/unreadNSFWY.png rename to src/Monitoring/Favicon/Original/unreadNSFWY.png diff --git a/src/General/img/favicons/Original/unreadSFW.png b/src/Monitoring/Favicon/Original/unreadSFW.png similarity index 100% rename from src/General/img/favicons/Original/unreadSFW.png rename to src/Monitoring/Favicon/Original/unreadSFW.png diff --git a/src/General/img/favicons/Original/unreadSFWY.png b/src/Monitoring/Favicon/Original/unreadSFWY.png similarity index 100% rename from src/General/img/favicons/Original/unreadSFWY.png rename to src/Monitoring/Favicon/Original/unreadSFWY.png diff --git a/src/General/img/favicons/dead.gif b/src/Monitoring/Favicon/dead.gif similarity index 100% rename from src/General/img/favicons/dead.gif rename to src/Monitoring/Favicon/dead.gif diff --git a/src/General/img/favicons/empty.gif b/src/Monitoring/Favicon/empty.gif similarity index 100% rename from src/General/img/favicons/empty.gif rename to src/Monitoring/Favicon/empty.gif diff --git a/src/General/img/favicons/exclamation.png b/src/Monitoring/Favicon/exclamation.png similarity index 100% rename from src/General/img/favicons/exclamation.png rename to src/Monitoring/Favicon/exclamation.png diff --git a/src/General/img/favicons/ferongr/unreadDead.png b/src/Monitoring/Favicon/ferongr/unreadDead.png similarity index 100% rename from src/General/img/favicons/ferongr/unreadDead.png rename to src/Monitoring/Favicon/ferongr/unreadDead.png diff --git a/src/General/img/favicons/ferongr/unreadDeadY.png b/src/Monitoring/Favicon/ferongr/unreadDeadY.png similarity index 100% rename from src/General/img/favicons/ferongr/unreadDeadY.png rename to src/Monitoring/Favicon/ferongr/unreadDeadY.png diff --git a/src/General/img/favicons/ferongr/unreadNSFW.png b/src/Monitoring/Favicon/ferongr/unreadNSFW.png similarity index 100% rename from src/General/img/favicons/ferongr/unreadNSFW.png rename to src/Monitoring/Favicon/ferongr/unreadNSFW.png diff --git a/src/General/img/favicons/ferongr/unreadNSFWY.png b/src/Monitoring/Favicon/ferongr/unreadNSFWY.png similarity index 100% rename from src/General/img/favicons/ferongr/unreadNSFWY.png rename to src/Monitoring/Favicon/ferongr/unreadNSFWY.png diff --git a/src/General/img/favicons/ferongr/unreadSFW.png b/src/Monitoring/Favicon/ferongr/unreadSFW.png similarity index 100% rename from src/General/img/favicons/ferongr/unreadSFW.png rename to src/Monitoring/Favicon/ferongr/unreadSFW.png diff --git a/src/General/img/favicons/ferongr/unreadSFWY.png b/src/Monitoring/Favicon/ferongr/unreadSFWY.png similarity index 100% rename from src/General/img/favicons/ferongr/unreadSFWY.png rename to src/Monitoring/Favicon/ferongr/unreadSFWY.png diff --git a/src/General/img/favicons/xat-/unreadDead.png b/src/Monitoring/Favicon/xat-/unreadDead.png similarity index 100% rename from src/General/img/favicons/xat-/unreadDead.png rename to src/Monitoring/Favicon/xat-/unreadDead.png diff --git a/src/General/img/favicons/xat-/unreadDeadY.png b/src/Monitoring/Favicon/xat-/unreadDeadY.png similarity index 100% rename from src/General/img/favicons/xat-/unreadDeadY.png rename to src/Monitoring/Favicon/xat-/unreadDeadY.png diff --git a/src/General/img/favicons/xat-/unreadNSFW.png b/src/Monitoring/Favicon/xat-/unreadNSFW.png similarity index 100% rename from src/General/img/favicons/xat-/unreadNSFW.png rename to src/Monitoring/Favicon/xat-/unreadNSFW.png diff --git a/src/General/img/favicons/xat-/unreadNSFWY.png b/src/Monitoring/Favicon/xat-/unreadNSFWY.png similarity index 100% rename from src/General/img/favicons/xat-/unreadNSFWY.png rename to src/Monitoring/Favicon/xat-/unreadNSFWY.png diff --git a/src/General/img/favicons/xat-/unreadSFW.png b/src/Monitoring/Favicon/xat-/unreadSFW.png similarity index 100% rename from src/General/img/favicons/xat-/unreadSFW.png rename to src/Monitoring/Favicon/xat-/unreadSFW.png diff --git a/src/General/img/favicons/xat-/unreadSFWY.png b/src/Monitoring/Favicon/xat-/unreadSFWY.png similarity index 100% rename from src/General/img/favicons/xat-/unreadSFWY.png rename to src/Monitoring/Favicon/xat-/unreadSFWY.png diff --git a/src/Monitoring/ThreadUpdater.coffee b/src/Monitoring/ThreadUpdater.coffee index dfe2abc42..bc32e55e8 100755 --- a/src/Monitoring/ThreadUpdater.coffee +++ b/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) -> diff --git a/src/General/html/Monitoring/ThreadWatcher.html b/src/Monitoring/ThreadWatcher.html similarity index 100% rename from src/General/html/Monitoring/ThreadWatcher.html rename to src/Monitoring/ThreadWatcher.html diff --git a/src/General/audio/beep.wav b/src/Monitoring/beep.wav similarity index 100% rename from src/General/audio/beep.wav rename to src/Monitoring/beep.wav diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee index 2f7902038..c5a5a80ad 100644 --- a/src/Posting/QR.coffee +++ b/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 diff --git a/src/General/html/Features/QuickReply.html b/src/Posting/QuickReply.html similarity index 100% rename from src/General/html/Features/QuickReply.html rename to src/Posting/QuickReply.html diff --git a/src/General/lib/board.class b/src/classes/Board.coffee similarity index 100% rename from src/General/lib/board.class rename to src/classes/Board.coffee diff --git a/src/General/lib/callbacks.class b/src/classes/Callbacks.coffee similarity index 100% rename from src/General/lib/callbacks.class rename to src/classes/Callbacks.coffee diff --git a/src/General/lib/catalogthread.class b/src/classes/CatalogThread.coffee similarity index 100% rename from src/General/lib/catalogthread.class rename to src/classes/CatalogThread.coffee diff --git a/src/General/lib/clone.class b/src/classes/Clone.coffee similarity index 100% rename from src/General/lib/clone.class rename to src/classes/Clone.coffee diff --git a/src/General/lib/connection.class b/src/classes/Connection.coffee similarity index 100% rename from src/General/lib/connection.class rename to src/classes/Connection.coffee diff --git a/src/General/lib/databoard.class b/src/classes/DataBoard.coffee similarity index 100% rename from src/General/lib/databoard.class rename to src/classes/DataBoard.coffee diff --git a/src/General/lib/fetcher.class b/src/classes/Fetcher.coffee similarity index 100% rename from src/General/lib/fetcher.class rename to src/classes/Fetcher.coffee diff --git a/src/General/lib/notice.class b/src/classes/Notice.coffee similarity index 100% rename from src/General/lib/notice.class rename to src/classes/Notice.coffee diff --git a/src/General/lib/post.class b/src/classes/Post.coffee similarity index 100% rename from src/General/lib/post.class rename to src/classes/Post.coffee diff --git a/src/General/lib/randomaccesslist.class b/src/classes/RandomAccessList.coffee similarity index 100% rename from src/General/lib/randomaccesslist.class rename to src/classes/RandomAccessList.coffee diff --git a/src/General/lib/set.class b/src/classes/Set.coffee similarity index 100% rename from src/General/lib/set.class rename to src/classes/Set.coffee diff --git a/src/General/lib/simpledict.class b/src/classes/SimpleDict.coffee similarity index 100% rename from src/General/lib/simpledict.class rename to src/classes/SimpleDict.coffee diff --git a/src/General/lib/thread.class b/src/classes/Thread.coffee similarity index 100% rename from src/General/lib/thread.class rename to src/classes/Thread.coffee diff --git a/src/General/css/burichan.css b/src/css/burichan.css similarity index 100% rename from src/General/css/burichan.css rename to src/css/burichan.css diff --git a/src/General/css/custom.css b/src/css/custom.css similarity index 100% rename from src/General/css/custom.css rename to src/css/custom.css diff --git a/src/General/css/font-awesome.css b/src/css/font-awesome.css similarity index 100% rename from src/General/css/font-awesome.css rename to src/css/font-awesome.css diff --git a/src/General/css/futaba.css b/src/css/futaba.css similarity index 100% rename from src/General/css/futaba.css rename to src/css/futaba.css diff --git a/src/General/css/photon.css b/src/css/photon.css similarity index 100% rename from src/General/css/photon.css rename to src/css/photon.css diff --git a/src/General/css/report.css b/src/css/report.css similarity index 100% rename from src/General/css/report.css rename to src/css/report.css diff --git a/src/General/css/style.css b/src/css/style.css similarity index 99% rename from src/General/css/style.css rename to src/css/style.css index f2a930e81..b43bc50a0 100755 --- a/src/General/css/style.css +++ b/src/css/style.css @@ -1758,7 +1758,7 @@ a:only-of-type > .remove { } /* Link Title Favicons */ <%= -grunt.file.expand('src/General/img/links/*.png').map(function(file) { +grunt.file.expand('src/Linkification/icons/*.png').map(function(file) { var key = file.match(/(\w+)\.png/)[1]; var data = grunt.file.read(file, {encoding: 'base64'}); return ".linkify."+key+" {\n" + diff --git a/src/General/css/tomorrow.css b/src/css/tomorrow.css similarity index 100% rename from src/General/css/tomorrow.css rename to src/css/tomorrow.css diff --git a/src/General/css/yotsuba-b.css b/src/css/yotsuba-b.css similarity index 100% rename from src/General/css/yotsuba-b.css rename to src/css/yotsuba-b.css diff --git a/src/General/css/yotsuba.css b/src/css/yotsuba.css similarity index 100% rename from src/General/css/yotsuba.css rename to src/css/yotsuba.css diff --git a/src/General/meta/botproc.js b/src/meta/botproc.js similarity index 100% rename from src/General/meta/botproc.js rename to src/meta/botproc.js diff --git a/src/General/img/icon.gif b/src/meta/icon.gif similarity index 100% rename from src/General/img/icon.gif rename to src/meta/icon.gif diff --git a/src/General/img/icon128.png b/src/meta/icon128.png similarity index 100% rename from src/General/img/icon128.png rename to src/meta/icon128.png diff --git a/src/General/img/icon16.png b/src/meta/icon16.png similarity index 100% rename from src/General/img/icon16.png rename to src/meta/icon16.png diff --git a/src/General/img/icon48.png b/src/meta/icon48.png similarity index 100% rename from src/General/img/icon48.png rename to src/meta/icon48.png diff --git a/src/General/meta/manifest.json b/src/meta/manifest.json similarity index 100% rename from src/General/meta/manifest.json rename to src/meta/manifest.json diff --git a/src/General/meta/metadata.js b/src/meta/metadata.js similarity index 95% rename from src/General/meta/metadata.js rename to src/meta/metadata.js index f7d407810..23981cb7d 100755 --- a/src/General/meta/metadata.js +++ b/src/meta/metadata.js @@ -26,5 +26,5 @@ // @run-at document-start <% if (channel !== 'dev') { %>// @updateURL <%= (channel !== 'noupdate') ? (meta.downloads + name + meta.suffix[channel] + '.meta.js') : 'https://noupdate.invalid/' %> // @downloadURL <%= (channel !== 'noupdate') ? (meta.downloads + name + meta.suffix[channel] + '.user.js') : 'https://noupdate.invalid/' %> -<% } %>// @icon data:image/png;base64,<%= grunt.file.read('src/General/img/icon48.png', {encoding: 'base64'}) %> +<% } %>// @icon data:image/png;base64,<%= grunt.file.read('src/meta/icon48.png', {encoding: 'base64'}) %> // ==/UserScript== diff --git a/src/General/meta/updates.xml b/src/meta/updates.xml similarity index 100% rename from src/General/meta/updates.xml rename to src/meta/updates.xml diff --git a/src/General/meta/usestrict.js b/src/meta/usestrict.js similarity index 100% rename from src/General/meta/usestrict.js rename to src/meta/usestrict.js