-
Export |
-
Import |
-
+
Export |
+
Import |
+
Reset Settings |
+
<%= meta.name %> |
#{g.VERSION} |
Issues |
diff --git a/src/General/lib/$.coffee b/src/General/lib/$.coffee
index 3e45ed12a..1e7291598 100755
--- a/src/General/lib/$.coffee
+++ b/src/General/lib/$.coffee
@@ -54,6 +54,8 @@ $.ajax = do ->
if whenModified
r.setRequestHeader 'If-Modified-Since', lastModified[url] if url of lastModified
$.on r, 'load', -> lastModified[url] = r.getResponseHeader 'Last-Modified'
+ if /\.json$/.test url
+ r.responseType = 'json'
$.extend r, options
$.extend r.upload, upCallbacks
r.send form
@@ -113,11 +115,11 @@ $.X = (path, root) ->
# XPathResult.ORDERED_NODE_SNAPSHOT_TYPE === 7
d.evaluate path, root, null, 7, null
-$.addClass = (el, className) ->
- el.classList.add className
+$.addClass = (el, className...) ->
+ el.classList.add className...
-$.rmClass = (el, className) ->
- el.classList.remove className
+$.rmClass = (el, className...) ->
+ el.classList.remove className...
$.toggleClass = (el, className) ->
el.classList.toggle className
@@ -131,12 +133,8 @@ $.rm = do ->
else
(el) -> el.parentNode?.removeChild el
-$.rmAll = (root) ->
- # jsperf.com/emptify-element
- for node in [root.childNodes...]
- # HTMLSelectElement.remove !== Element.remove
- root.removeChild node
- return
+# jsperf.com/emptify-element/9
+$.rmAll = (root) -> root.textContent = ''
$.tn = (s) ->
d.createTextNode s
@@ -332,29 +330,50 @@ $.get = (key, val, cb) ->
chrome.storage.sync.get syncItems, done
$.set = do ->
- items = {}
- localItems = {}
+ items =
+ sync: {}
+ local: {}
+ timeout = {}
- set = $.debounce $.SECOND, ->
+ setArea = (area) ->
+ data = items[area]
+ return if !Object.keys(data).length or timeout[area]
+ items[area] = {}
+ chrome.storage[area].set data, ->
+ if chrome.runtime.lastError
+ c.error chrome.runtime.lastError.message
+ for key, val of data when key not of items[area]
+ items[area][key] = val
+ timeout[area] = setTimeout setArea, $.MINUTE, area
+ return
+ delete timeout[area]
+
+ setAll = $.debounce $.SECOND, ->
for key in $.localKeys
- if key of items
- (localItems or= {})[key] = items[key]
- delete items[key]
+ if key of items.sync
+ items.local[key] = items.sync[key]
+ delete items.sync[key]
try
- chrome.storage.local.set localItems
- chrome.storage.sync.set items
- items = {}
- localItems = {}
+ setArea 'local'
+ setArea 'sync'
catch err
c.error err.stack
(key, val) ->
if typeof key is 'string'
- items[key] = val
+ items.sync[key] = val
else
- $.extend items, key
- set()
-
+ $.extend items.sync, key
+ setAll()
+$.clear = (cb) ->
+ count = 2
+ done = ->
+ if chrome.runtime.lastError
+ c.error chrome.runtime.lastError.message
+ return
+ cb?() unless --count
+ chrome.storage.local.clear done
+ chrome.storage.sync.clear done
<% } else { %>
# http://wiki.greasespot.net/Main_Page
@@ -402,6 +421,9 @@ $.set = do ->
for key, val of keys
set key, val
return
+$.clear = (cb) ->
+ $.delete GM_listValues().map (key) -> key.replace g.NAMESPACE, ''
+ cb?()
<% } %>
$.remove = (arr, value) ->
diff --git a/src/General/lib/databoard.class b/src/General/lib/databoard.class
index ff0162aad..fec423990 100755
--- a/src/General/lib/databoard.class
+++ b/src/General/lib/databoard.class
@@ -78,7 +78,7 @@ class DataBoard
return
board = @data.boards[boardID]
threads = {}
- for page in JSON.parse e.target.response
+ for page in e.target.response
for thread in page.threads
if thread.no of board
threads[thread.no] = board[thread.no]
@@ -93,4 +93,4 @@ class DataBoard
disconnect: ->
$.desync @key
delete @sync
- delete @data
\ No newline at end of file
+ delete @data
diff --git a/src/General/meta/metadata.js b/src/General/meta/metadata.js
index f41ea591d..9dac93a7e 100755
--- a/src/General/meta/metadata.js
+++ b/src/General/meta/metadata.js
@@ -14,6 +14,7 @@
// @grant GM_getValue
// @grant GM_setValue
// @grant GM_deleteValue
+// @grant GM_listValues
// @grant GM_openInTab
// @run-at document-start
// @updateURL <%= meta.repo %>raw/stable/builds/<%= meta.files.metajs %>
diff --git a/src/Images/Gallery.coffee b/src/Images/Gallery.coffee
index 3aa5585b1..8529266c1 100644
--- a/src/Images/Gallery.coffee
+++ b/src/Images/Gallery.coffee
@@ -203,7 +203,8 @@ Gallery =
$.ajax "//api.4chan.org/#{post.board}/res/#{post.thread}.json", onload: ->
return if @status isnt 200
i = 0
- while postObj = JSON.parse(@response).posts[i++]
+ {posts} = @response
+ while postObj = posts[i++]
break if postObj.no is post.ID
unless postObj.no
return post.kill()
diff --git a/src/Images/ImageExpand.coffee b/src/Images/ImageExpand.coffee
index ed2cd2fa7..057964e53 100644
--- a/src/Images/ImageExpand.coffee
+++ b/src/Images/ImageExpand.coffee
@@ -156,10 +156,19 @@ ImageExpand =
return
timeoutID = setTimeout ImageExpand.expand, 10000, post
+ <% if (type === 'crx') { %>
+ $.ajax @src,
+ onloadend: ->
+ return if @status isnt 404
+ clearTimeout timeoutID
+ post.kill true
+ ,
+ type: 'head'
+ <% } else { %>
# XXX CORS for i.4cdn.org WHEN?
$.ajax "//a.4cdn.org/#{post.board}/res/#{post.thread}.json", onload: ->
return if @status isnt 200
- for postObj in JSON.parse(@response).posts
+ for postObj in @response.posts
break if postObj.no is post.ID
if postObj.no isnt post.ID
clearTimeout timeoutID
@@ -167,6 +176,7 @@ ImageExpand =
else if postObj.filedeleted
clearTimeout timeoutID
post.kill true
+ <% } %>
menu:
init: ->
diff --git a/src/Images/ImageHover.coffee b/src/Images/ImageHover.coffee
index 9116a6c95..9ef4f10e7 100755
--- a/src/Images/ImageHover.coffee
+++ b/src/Images/ImageHover.coffee
@@ -38,10 +38,19 @@ ImageHover =
return
timeoutID = setTimeout (=> @src = post.file.URL + '?' + Date.now()), 3000
+ <% if (type === 'crx') { %>
+ $.ajax @src,
+ onloadend: ->
+ return if @status isnt 404
+ clearTimeout timeoutID
+ post.kill true
+ ,
+ type: 'head'
+ <% } else { %>
# XXX CORS for i.4cdn.org WHEN?
$.ajax "//a.4cdn.org/#{post.board}/res/#{post.thread}.json", onload: ->
return if @status isnt 200
- for postObj in JSON.parse(@response).posts
+ for postObj in @response.posts
break if postObj.no is post.ID
if postObj.no isnt post.ID
clearTimeout timeoutID
@@ -49,3 +58,4 @@ ImageHover =
else if postObj.filedeleted
clearTimeout timeoutID
post.kill true
+ <% } %>
diff --git a/src/Linkification/Linkify.coffee b/src/Linkification/Linkify.coffee
index 236e68097..52d241cdb 100755
--- a/src/Linkification/Linkify.coffee
+++ b/src/Linkification/Linkify.coffee
@@ -241,7 +241,7 @@ Linkify =
service = Linkify.types[key].title
switch response.status
when 200, 304
- text = "#{service.text JSON.parse response.responseText}"
+ text = "#{service.text response.response}"
if Conf['Embedding']
embed.dataset.title = text
when 404
@@ -304,7 +304,7 @@ Linkify =
$.cache "https://mediacru.sh/#{a.dataset.uid}.json", ->
{status} = @
return div.innerHTML = "ERROR #{status}" unless status in [200, 304]
- {files} = JSON.parse @response
+ {files} = @response
for type in ['video/mp4', 'video/ogv', 'image/svg+xml', 'image/png', 'image/gif', 'image/jpeg', 'image/svg', 'audio/mpeg']
for file in files
if file.type is type
diff --git a/src/Miscellaneous/AnnouncementHiding.coffee b/src/Miscellaneous/AnnouncementHiding.coffee
index a27290420..883159e6c 100755
--- a/src/Miscellaneous/AnnouncementHiding.coffee
+++ b/src/Miscellaneous/AnnouncementHiding.coffee
@@ -1,10 +1,9 @@
PSAHiding =
init: ->
return unless Conf['Announcement Hiding']
-
$.addClass doc, 'hide-announcement'
-
$.on d, '4chanXInitFinished', @setup
+
setup: ->
$.off d, '4chanXInitFinished', PSAHiding.setup
diff --git a/src/Miscellaneous/ExpandThread.coffee b/src/Miscellaneous/ExpandThread.coffee
index 69accf4af..beed897f5 100755
--- a/src/Miscellaneous/ExpandThread.coffee
+++ b/src/Miscellaneous/ExpandThread.coffee
@@ -77,13 +77,13 @@ ExpandThread =
a.textContent = "Error #{req.statusText} (#{req.status})"
return
- data = JSON.parse(req.response).posts
- Build.spoilerRange[thread.board] = data.shift().custom_spoiler
+ Build.spoilerRange[thread.board] = req.response.posts[0].custom_spoiler
posts = []
postsRoot = []
filesCount = 0
- for postData in data
+ for postData in req.response.posts
+ continue if postData.no is thread.ID
if post = thread.posts[postData.no]
filesCount++ if 'file' of post
postsRoot.push post.nodes.root
diff --git a/src/Monitoring/ThreadStats.coffee b/src/Monitoring/ThreadStats.coffee
index bb1e3ae29..03af30d89 100755
--- a/src/Monitoring/ThreadStats.coffee
+++ b/src/Monitoring/ThreadStats.coffee
@@ -77,9 +77,8 @@ ThreadStats =
onThreadsLoad: ->
return unless Conf["Page Count in Stats"] and @status is 200
- pages = JSON.parse @response
- for page in pages
+ for page in @response
for thread in page.threads when thread.no is ThreadStats.thread.ID
ThreadStats.pageCountEl.textContent = page.page
- (if page.page is pages.length - 1 then $.addClass else $.rmClass) ThreadStats.pageCountEl, 'warning'
+ (if page.page is @response.length - 1 then $.addClass else $.rmClass) ThreadStats.pageCountEl, 'warning'
return
diff --git a/src/Monitoring/ThreadUpdater.coffee b/src/Monitoring/ThreadUpdater.coffee
index d672b6cfd..de1975ea5 100755
--- a/src/Monitoring/ThreadUpdater.coffee
+++ b/src/Monitoring/ThreadUpdater.coffee
@@ -159,7 +159,7 @@ ThreadUpdater =
switch req.status
when 200
g.DEAD = false
- ThreadUpdater.parse JSON.parse(req.response).posts
+ ThreadUpdater.parse req.response.posts
ThreadUpdater.setInterval()
when 404
g.DEAD = true
diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee
index 7a23273cc..8d910d027 100644
--- a/src/Posting/QR.coffee
+++ b/src/Posting/QR.coffee
@@ -695,7 +695,7 @@ QR =
# Too many frequent mistyped captchas will auto-ban you!
# On connection error, the post most likely didn't go through.
QR.cooldown.set delay: 2
- else if err.textContent and m = err.textContent.match /wait\s(\d+)\ssecond/i
+ else if err.textContent and m = err.textContent.match /wait\s+(\d+)\s+second/i
QR.cooldown.auto = if QR.captcha.isEnabled
!!QR.captcha.captchas.length
else