From cc03357e071dc33bc54d4e25870998bde2d34139 Mon Sep 17 00:00:00 2001 From: ccd0 Date: Fri, 29 Jan 2016 02:00:34 -0800 Subject: [PATCH] Revert "Fetch boards.json data." This reverts commit 19ba43ae3dfc6008893ad9ebdbd0e68ecb60de01. --- Gruntfile.coffee | 1 - src/General/BoardsJSON.coffee | 32 -------------------------------- src/General/Main.coffee | 2 -- src/classes/Board.coffee | 1 - 4 files changed, 36 deletions(-) delete mode 100644 src/General/BoardsJSON.coffee diff --git a/Gruntfile.coffee b/Gruntfile.coffee index 367218796..9ca14c14f 100644 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -108,7 +108,6 @@ module.exports = (grunt) -> 'src/classes/Connection.coffee' 'src/classes/Fetcher.coffee' 'src/General/Polyfill.coffee' - 'src/General/BoardsJSON.coffee' 'src/General/Header.coffee' 'src/General/Index.coffee' 'src/General/Build.coffee' diff --git a/src/General/BoardsJSON.coffee b/src/General/BoardsJSON.coffee deleted file mode 100644 index e73630f76..000000000 --- a/src/General/BoardsJSON.coffee +++ /dev/null @@ -1,32 +0,0 @@ -BoardsJSON = - cbs: [] - - init: -> - if (Conf['boardsJSON'].lastChecked or 0) < Date.now() - 2 * $.HOUR - $.ajax '//a.4cdn.org/boards.json', onloadend: @load - else - @set Conf['boardsJSON'].boards - - load: -> - if @status is 200 - boards = {} - for board in @response.boards - boards[board.board] = board - $.set 'boardsJSON', {boards, lastChecked: Date.now()} - else - {boards} = Conf['boardsJSON'] - new Notice 'warning', "Failed to load boards JSON. Error #{@statusText} (#{@status})", 20 - BoardsJSON.set boards - - set: (@boards) -> - for ID, board of @boards - g.boards[ID]?.json = board - for cb in @cbs - $.queueTask cb - return - - ready: (cb) -> - if @boards - cb() - else - @cbs.push cb diff --git a/src/General/Main.coffee b/src/General/Main.coffee index 61d09af42..7db610394 100644 --- a/src/General/Main.coffee +++ b/src/General/Main.coffee @@ -36,7 +36,6 @@ Main = for db in DataBoard.keys Conf[db] = boards: {} - Conf['boardsJSON'] = boards: {} Conf['selectedArchives'] = {} Conf['cooldowns'] = {} @@ -358,7 +357,6 @@ Main = features: [ ['Polyfill', Polyfill] - ['Boards JSON', BoardsJSON] ['Normalize URL', NormalizeURL] ['Captcha Configuration', Captcha.replace] ['Redirect', Redirect] diff --git a/src/classes/Board.coffee b/src/classes/Board.coffee index 073f24fd5..7f811d463 100644 --- a/src/classes/Board.coffee +++ b/src/classes/Board.coffee @@ -4,6 +4,5 @@ class Board constructor: (@ID) -> @threads = new SimpleDict() @posts = new SimpleDict() - @json = BoardsJSON.boards?[@ID] g.boards[@] = @