";
Settings.overlay = overlay = $.el('div', {
id: 'overlay'
});
@@ -10687,7 +11817,7 @@
}
});
div = $.el('div', {
- innerHTML: ": Clear manually-hidden threads and posts on all boards. Refresh the page to apply."
+ innerHTML: ": Clear manually-hidden threads and posts on all boards. Reload the page to apply."
});
button = $('button', div);
hiddenNum = 0;
@@ -10788,7 +11918,7 @@
try {
data = JSON.parse(e.target.result);
Settings.loadSettings(data);
- if (confirm('Import successful. Refresh now?')) {
+ if (confirm('Import successful. Reload now?')) {
return window.location.reload();
}
} catch (_error) {
@@ -10921,11 +12051,11 @@
$.add(div, ta);
return;
}
- return div.innerHTML = "
Filter is disabled.
\nUse regular expressions, one per line. \nLines starting with a # will be ignored. \nFor example, /weeaboo/i will filter posts containing the string `weeaboo`, case-insensitive. \nMD5 filtering uses exact string matching, not regular expressions.\n
You can use these settings with each regular expression, separate them with semicolons:\n
\n Per boards, separate them with commas. It is global if not specified. \n For example: boards:a,jp;.\n
\n Filter OPs only along with their threads (`only`), replies only (`no`), or both (`yes`, this is default). \n For example: op:only;, op:no; or op:yes;.\n
\n Overrule the `Show Stubs` setting if specified: create a stub (`yes`) or not (`no`). \n For example: stub:yes; or stub:no;.\n
\n Highlight instead of hiding. You can specify a class name to use with a userstyle. \n For example: highlight; or highlight:wallpaper;.\n
\n Highlighted OPs will have their threads put on top of board pages by default. \n For example: top:yes; or top:no;.\n
";
+ return div.innerHTML = "
Filter is disabled.
Use regular expressions, one per line. Lines starting with a # will be ignored. For example, /weeaboo/i will filter posts containing the string `weeaboo`, case-insensitive. MD5 filtering uses exact string matching, not regular expressions.
You can use these settings with each regular expression, separate them with semicolons:
Per boards, separate them with commas. It is global if not specified. For example: boards:a,jp;.
Filter OPs only along with their threads (`only`), replies only (`no`), or both (`yes`, this is default). For example: op:only;, op:no; or op:yes;.
Overrule the `Show Stubs` setting if specified: create a stub (`yes`) or not (`no`). For example: stub:yes; or stub:no;.
Highlight instead of hiding. You can specify a class name to use with a userstyle. For example: highlight; or highlight:wallpaper;.
Highlighted OPs will have their threads put on top of the board index by default. For example: top:yes; or top:no;.
";
Settings.overlay = overlay = $.el('div', {
id: 'overlay'
});
@@ -10680,7 +11806,7 @@
}
});
div = $.el('div', {
- innerHTML: ": Clear manually-hidden threads and posts on all boards. Refresh the page to apply."
+ innerHTML: ": Clear manually-hidden threads and posts on all boards. Reload the page to apply."
});
button = $('button', div);
hiddenNum = 0;
@@ -10779,7 +11905,7 @@
try {
data = JSON.parse(e.target.result);
Settings.loadSettings(data);
- if (confirm('Import successful. Refresh now?')) {
+ if (confirm('Import successful. Reload now?')) {
return window.location.reload();
}
} catch (_error) {
@@ -10912,11 +12038,11 @@
$.add(div, ta);
return;
}
- return div.innerHTML = "
Filter is disabled.
\nUse regular expressions, one per line. \nLines starting with a # will be ignored. \nFor example, /weeaboo/i will filter posts containing the string `weeaboo`, case-insensitive. \nMD5 filtering uses exact string matching, not regular expressions.\n
You can use these settings with each regular expression, separate them with semicolons:\n
\n Per boards, separate them with commas. It is global if not specified. \n For example: boards:a,jp;.\n
\n Filter OPs only along with their threads (`only`), replies only (`no`), or both (`yes`, this is default). \n For example: op:only;, op:no; or op:yes;.\n
\n Overrule the `Show Stubs` setting if specified: create a stub (`yes`) or not (`no`). \n For example: stub:yes; or stub:no;.\n
\n Highlight instead of hiding. You can specify a class name to use with a userstyle. \n For example: highlight; or highlight:wallpaper;.\n
\n Highlighted OPs will have their threads put on top of board pages by default. \n For example: top:yes; or top:no;.\n
";
+ return div.innerHTML = "
Filter is disabled.
Use regular expressions, one per line. Lines starting with a # will be ignored. For example, /weeaboo/i will filter posts containing the string `weeaboo`, case-insensitive. MD5 filtering uses exact string matching, not regular expressions.
You can use these settings with each regular expression, separate them with semicolons:
Per boards, separate them with commas. It is global if not specified. For example: boards:a,jp;.
Filter OPs only along with their threads (`only`), replies only (`no`), or both (`yes`, this is default). For example: op:only;, op:no; or op:yes;.
Overrule the `Show Stubs` setting if specified: create a stub (`yes`) or not (`no`). For example: stub:yes; or stub:no;.
Highlight instead of hiding. You can specify a class name to use with a userstyle. For example: highlight; or highlight:wallpaper;.
Highlighted OPs will have their threads put on top of the board index by default. For example: top:yes; or top:no;.
diff --git a/src/General/html/Settings/Filter-guide.html b/src/General/html/Settings/Filter-guide.html
index 3e78003d2..579a12137 100755
--- a/src/General/html/Settings/Filter-guide.html
+++ b/src/General/html/Settings/Filter-guide.html
@@ -23,7 +23,7 @@
For example: highlight; or highlight:wallpaper;.
- Highlighted OPs will have their threads put on top of board pages by default.
+ Highlighted OPs will have their threads put on top of the board index by default.
For example: top:yes; or top:no;.
diff --git a/src/General/lib/$.coffee b/src/General/lib/$.coffee
index ddafd149a..d91010ae8 100755
--- a/src/General/lib/$.coffee
+++ b/src/General/lib/$.coffee
@@ -1,31 +1,17 @@
-String::capitalize = ->
- @charAt(0).toUpperCase() + @slice(1);
-
-String::contains = (string) ->
- @indexOf(string) > -1
-
-Array::contains = (object) ->
- @indexOf(object) > -1
-
-Array::indexOf = (object) ->
- i = @length
- while i--
- return i if @[i] is object
- return i
-
# loosely follows the jquery api:
# http://api.jquery.com/
# not chainable
$ = (selector, root=d.body) ->
root.querySelector selector
-$.extend = (object, properties) ->
- for key, val of properties
- continue unless properties.hasOwnProperty key
- object[key] = val
+$.extend = (obj, prop) ->
+ obj[key] = val for key, val of prop when prop.hasOwnProperty key
return
-$.DAY = 24 * ($.HOUR = 60 * ($.MINUTE = 60 * ($.SECOND = 1000)))
+$.DAY = 24 *
+ $.HOUR = 60 *
+ $.MINUTE = 60 *
+ $.SECOND = 1000
$.id = (id) ->
d.getElementById id
@@ -66,7 +52,7 @@ $.ajax = do ->
type or= form and 'post' or 'get'
r.open type, url, !sync
if whenModified
- r.setRequestHeader 'If-Modified-Since', lastModified[url] or '0'
+ r.setRequestHeader 'If-Modified-Since', lastModified[url] if url of lastModified
$.on r, 'load', -> lastModified[url] = r.getResponseHeader 'Last-Modified'
$.extend r, options
$.extend r.upload, upCallbacks
@@ -137,7 +123,7 @@ $.toggleClass = (el, className) ->
el.classList.toggle className
$.hasClass = (el, className) ->
- el.classList.contains className
+ className in el.classList
$.rm = do ->
if 'remove' of Element::
@@ -147,7 +133,7 @@ $.rm = do ->
$.rmAll = (root) ->
# jsperf.com/emptify-element
- while node = root.firstChild
+ for node in [root.childNodes...]
# HTMLSelectElement.remove !== Element.remove
root.removeChild node
return
@@ -287,7 +273,7 @@ $.sync = do ->
chrome.storage.onChanged.addListener (changes) ->
for key of changes
if cb = $.syncing[key]
- cb changes[key].newValue
+ cb changes[key].newValue, key
return
(key, cb) -> $.syncing[key] = cb
@@ -330,9 +316,8 @@ $.get = (key, val, cb) ->
count = 0
done = (item) ->
- {lastError} = chrome.runtime
- if lastError
- c.error lastError, lastError.message or 'No message.'
+ if chrome.runtime.lastError
+ c.error chrome.runtime.lastError.message
$.extend items, item
cb items unless --count
@@ -368,11 +353,12 @@ $.set = do ->
set()
<% } else { %>
+
# http://wiki.greasespot.net/Main_Page
$.sync = do ->
- $.on window, 'storage', (e) ->
- if cb = $.syncing[e.key]
- cb JSON.parse e.newValue
+ $.on window, 'storage', ({key, newValue}) ->
+ if cb = $.syncing[key]
+ cb JSON.parse(newValue), key
(key, cb) -> $.syncing[g.NAMESPACE + key] = cb
$.delete = (keys) ->
diff --git a/src/General/lib/callbacks.class b/src/General/lib/callbacks.class
new file mode 100644
index 000000000..7a832f43c
--- /dev/null
+++ b/src/General/lib/callbacks.class
@@ -0,0 +1,20 @@
+class Callbacks
+ push: ({name, cb}) -> @[name] = cb
+
+ clean: ->
+ @rm name for name of @ when @hasOwnProperty name
+ return
+
+ rm: (name) -> delete @[name]
+
+ execute: (node) ->
+ for name of @ when @hasOwnProperty name
+ try
+ @[name].call node
+ catch err
+ errors = [] unless errors
+ errors.push
+ message: ['"', name, '" crashed on node No.', node, ' (', node.board, ').'].join('')
+ error: err
+
+ Main.handleErrors errors if errors
diff --git a/src/General/lib/classes.coffee b/src/General/lib/classes.coffee
index 74697eec3..5654ff914 100755
--- a/src/General/lib/classes.coffee
+++ b/src/General/lib/classes.coffee
@@ -1,6 +1,8 @@
+<%= 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/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') %>
\ No newline at end of file
+<%= grunt.file.read('src/General/lib/notice.class') %>
+<%= grunt.file.read('src/General/lib/randomaccesslist.class') %>
\ No newline at end of file
diff --git a/src/General/lib/databoard.class b/src/General/lib/databoard.class
index 6a96c6c4f..1dc37e235 100755
--- a/src/General/lib/databoard.class
+++ b/src/General/lib/databoard.class
@@ -74,7 +74,9 @@ class DataBoard
ajaxClean: (boardID) ->
$.cache "//a.4cdn.org/#{boardID}/threads.json", (e) =>
- return if e.target.status isnt 200
+ if e.target.status isnt 200
+ @delete boardID if e.target.status is 404
+ return
board = @data.boards[boardID]
threads = {}
for page in JSON.parse e.target.response
diff --git a/src/General/lib/notice.class b/src/General/lib/notice.class
index 60b46ff77..ea5f6f360 100644
--- a/src/General/lib/notice.class
+++ b/src/General/lib/notice.class
@@ -1,7 +1,7 @@
class Notice
constructor: (type, content, @timeout) ->
@el = $.el 'div',
- innerHTML: '×'
+ innerHTML: ''
@el.style.opacity = 0
@setType type
$.on @el.firstElementChild, 'click', @close
@@ -19,7 +19,7 @@ class Notice
$.on d, 'visibilitychange', @add
return
$.off d, 'visibilitychange', @add
- $.add $.id('notifications'), @el
+ $.add Header.noticesRoot, @el
@el.clientHeight # force reflow
@el.style.opacity = 1
setTimeout @close, @timeout * $.SECOND if @timeout
diff --git a/src/General/lib/polyfill.coffee b/src/General/lib/polyfill.coffee
index 0ad7c1fe8..08ce47683 100755
--- a/src/General/lib/polyfill.coffee
+++ b/src/General/lib/polyfill.coffee
@@ -6,7 +6,7 @@ Polyfill =
@visibility()
<% } %>
notificationPermission: ->
- return if !window.Notification or 'permission' of Notification
+ return if !window.Notification or 'permission' of Notification or !window.webkitNotifications
Object.defineProperty Notification, 'permission',
get: ->
switch webkitNotifications.checkPermission()
@@ -27,7 +27,7 @@ Polyfill =
cb new Blob [ui8a], type: 'image/png'
visibility: ->
# page visibility API
- return unless 'webkitHidden' of document
+ return if 'visibilityState' of d
Object.defineProperties HTMLDocument.prototype,
visibilityState:
get: -> @webkitVisibilityState
diff --git a/src/General/lib/post.class b/src/General/lib/post.class
index a10d570b9..0943e520a 100755
--- a/src/General/lib/post.class
+++ b/src/General/lib/post.class
@@ -1,11 +1,12 @@
class Post
- @callbacks = []
+ @callbacks = new Callbacks()
toString: -> @ID
constructor: (root, @thread, @board, that={}) ->
@ID = +root.id[2..]
@fullID = "#{@board}.#{@ID}"
+ @cleanup root if that.isOriginalMarkup
post = $ '.post', root
info = $ '.postInfo', post
@nodes =
@@ -55,7 +56,7 @@ class Post
@parseComment()
@parseQuotes()
- @parseFile(that)
+ @parseFile that
@clones = []
g.posts[@fullID] = thread.posts[@] = board.posts[@] = @
@@ -111,7 +112,7 @@ class Post
# ES6 Set when?
fullID = "#{match[1]}.#{match[2]}"
- @quotes.push fullID unless @quotes.contains fullID
+ @quotes.push fullID unless fullID in @quotes
parseFile: (that) ->
return unless (fileEl = $ '.file', @nodes.post) and thumb = $ 'img[data-md5]', fileEl
@@ -149,6 +150,13 @@ class Post
if @file.isImage = /(jpg|png|gif)$/i.test @file.name
@file.dimensions = fileText.textContent.match(/\d+x\d+/)[0]
+ cleanup: (root) ->
+ for node in $$ '.mobile', root
+ $.rm node
+ for node in $$ '.desktop', root
+ $.rmClass node, 'desktop'
+ return
+
kill: (file, now) ->
now or= new Date()
if file
@@ -203,6 +211,12 @@ class Post
$.rmClass quotelink, 'deadlink'
return
+ collect: ->
+ @kill()
+ delete g.posts[@fullID]
+ delete @thread.posts[@]
+ delete @board.posts[@]
+
addClone: (context) ->
new Clone @, context
diff --git a/src/General/lib/randomaccesslist.class b/src/General/lib/randomaccesslist.class
new file mode 100644
index 000000000..0cc754d60
--- /dev/null
+++ b/src/General/lib/randomaccesslist.class
@@ -0,0 +1,58 @@
+class RandomAccessList
+ constructor: ->
+ @length = 0
+
+ push: (item) ->
+ {ID} = item
+ return if @[ID]
+ {last} = @
+ item.prev = last
+ @[ID] = item
+ @last = if last
+ last.next = item
+ else
+ @first = item
+ @length++
+
+ after: (root, item) ->
+ return if item.prev is root
+
+ @rmi item
+
+ {next} = root
+ root.next = item
+ item.prev = root
+ item.next = next
+ next.prev = item
+
+ prepend: (item) ->
+ {first} = @
+ return if item is first or not @[item.ID]
+ @rmi item
+ item.next = first
+ first.prev = item
+ @first = item
+ delete item.prev
+
+ shift: ->
+ @rm @first.ID
+
+ rm: (ID) ->
+ item = @[ID]
+ return unless item
+ delete @[ID]
+ @length--
+ @rmi item
+ delete item.next
+ delete item.prev
+
+ rmi: (item) ->
+ {prev, next} = item
+ if prev
+ prev.next = next
+ else
+ @first = next
+ if next
+ next.prev = prev
+ else
+ @last = prev
\ No newline at end of file
diff --git a/src/General/lib/thread.class b/src/General/lib/thread.class
index 1f15bf714..f05bfeebf 100755
--- a/src/General/lib/thread.class
+++ b/src/General/lib/thread.class
@@ -1,13 +1,50 @@
class Thread
- @callbacks = []
+ @callbacks = new Callbacks()
toString: -> @ID
constructor: (@ID, @board) ->
- @fullID = "#{@board}.#{@ID}"
- @posts = {}
+ @fullID = "#{@board}.#{@ID}"
+ @posts = {}
+ @isSticky = false
+ @isClosed = false
+ @postLimit = false
+ @fileLimit = false
g.threads[@fullID] = board.threads[@] = @
+ setPage: (pageNum) ->
+ icon = $ '.page-num', @OP.nodes.post
+ for key in ['title', 'textContent']
+ icon[key] = icon[key].replace /\d+/, pageNum
+ return
+ setStatus: (type, status) ->
+ name = "is#{type}"
+ return if @[name] is status
+ @[name] = status
+ return unless @OP
+ typeLC = type.toLowerCase()
+ unless status
+ $.rm $ ".#{typeLC}Icon", @OP.nodes.info
+ return
+ icon = $.el 'img',
+ src: "//s.4cdn.org/image/#{typeLC}#{if window.devicePixelRatio >= 2 then '@2x' else ''}.gif"
+ alt: type
+ title: type
+ className: "#{typeLC}Icon"
+ root = if type is 'Closed' and @isSticky
+ $ '.stickyIcon', @OP.nodes.info
+ else if g.VIEW is 'index'
+ $ '.page-num', @OP.nodes.info
+ else
+ $ '[title="Quote this post"]', @OP.nodes.info
+ $.after root, [$.tn(' '), icon]
+
kill: ->
@isDead = true
@timeOfDeath = Date.now()
+
+ collect: ->
+ for postID, post in @posts
+ post.collect()
+ delete g.threads[@fullID]
+ delete @board.threads[@]
diff --git a/src/General/meta/manifest.json b/src/General/meta/manifest.json
index 53039fd37..d1c79c7a7 100755
--- a/src/General/meta/manifest.json
+++ b/src/General/meta/manifest.json
@@ -15,7 +15,7 @@
"run_at": "document_start"
}],
"homepage_url": "<%= meta.page %>",
- "minimum_chrome_version": "27",
+ "minimum_chrome_version": "<%= meta.min.chrome %>",
"permissions": [
"storage"
]
diff --git a/src/General/meta/metadata.js b/src/General/meta/metadata.js
index 45a414083..2b8c066f2 100755
--- a/src/General/meta/metadata.js
+++ b/src/General/meta/metadata.js
@@ -1,8 +1,8 @@
// ==UserScript==
// @name <%= meta.name %>
// @version <%= version %>
-// @minGMVer 1.13
-// @minFFVer 22
+// @minGMVer <%= meta.min.greasemonkey %>
+// @minFFVer <%= meta.min.firefox %>
// @namespace <%= name %>
// @description <%= description %>
// @license MIT; <%= meta.repo %>blob/<%= meta.mainBranch %>/LICENSE
diff --git a/src/Images/FappeTyme.coffee b/src/Images/FappeTyme.coffee
index 29ebf2d30..200907e1d 100755
--- a/src/Images/FappeTyme.coffee
+++ b/src/Images/FappeTyme.coffee
@@ -2,33 +2,21 @@ FappeTyme =
init: ->
return if !(Conf['Fappe Tyme'] or Conf['Werk Tyme']) or g.VIEW is 'catalog' or g.BOARD is 'f'
- if Conf['Fappe Tyme']
+ for type in ["Fappe", "Werk"] when Conf["#{type} Tyme"]
+ lc = type.toLowerCase()
el = $.el 'label',
- innerHTML: " Fappe Tyme"
- title: 'Fappe Tyme'
+ innerHTML: " #{type} Tyme"
+ title: "#{type} Tyme"
- FappeTyme.fappe = input = el.firstElementChild
-
- $.on input, 'change', FappeTyme.cb.fappe
+ FappeTyme[lc] = input = el.firstElementChild
+ $.on input, 'change', FappeTyme.cb.toggle.bind input
$.event 'AddMenuEntry',
type: 'header'
el: el
order: 97
- if Conf['Werk Tyme']
- el = $.el 'label',
- innerHTML: " Werk Tyme"
- title: 'Werk Tyme'
-
- FappeTyme.werk = input = el.firstElementChild
-
- $.on input, 'change', FappeTyme.cb.werk
-
- $.event 'AddMenuEntry',
- type: 'header'
- el: el
- order: 98
+ FappeTyme.cb.set lc if Conf[lc]
Post.callbacks.push
name: 'Fappe Tyme'
@@ -39,9 +27,11 @@ FappeTyme =
$.addClass @nodes.root, "noFile"
cb:
- fappe: ->
- $.toggleClass doc, 'fappeTyme'
- FappeTyme.fappe.checked = $.hasClass doc, 'fappeTyme'
- werk: ->
- $.toggleClass doc, 'werkTyme'
- FappeTyme.werk.checked = $.hasClass doc, 'werkTyme'
\ No newline at end of file
+ set: (type) ->
+ FappeTyme[type].checked = Conf[type]
+ $["#{if Conf[type] then 'add' else 'rm'}Class"] doc, "#{type}Tyme"
+
+ toggle: ->
+ Conf[@name] = !Conf[@name]
+ FappeTyme.cb.set @name
+ $.cb.checked.call FappeTyme[@name]
\ No newline at end of file
diff --git a/src/Images/Gallery.coffee b/src/Images/Gallery.coffee
index 1397ac21e..efa7b20df 100644
--- a/src/Images/Gallery.coffee
+++ b/src/Images/Gallery.coffee
@@ -6,7 +6,7 @@ Gallery =
href: 'javascript:;'
id: 'appchan-gal'
title: 'Gallery'
- className: 'fourchanx-icon icon-picture'
+ className: 'fa fa-picture'
textContent: 'Gallery'
$.on el, 'click', @cb.toggle
@@ -247,7 +247,7 @@ Gallery =
label = $.el 'label',
innerHTML: " #{name}"
input = label.firstElementChild
- if ['Fit Width', 'Fit Height', 'Hide Thumbnails'].contains name
+ if name in ['Fit Width', 'Fit Height', 'Hide Thumbnails']
$.on input, 'change', Gallery.cb.setFitness
input.checked = Conf[name]
$.event 'change', null, input
diff --git a/src/Images/ImageExpand.coffee b/src/Images/ImageExpand.coffee
index 9a882f9fc..135a50481 100755
--- a/src/Images/ImageExpand.coffee
+++ b/src/Images/ImageExpand.coffee
@@ -3,12 +3,12 @@ ImageExpand =
return if g.VIEW is 'catalog' or !Conf['Image Expansion']
@EAI = $.el 'a',
- className: 'expand-all-shortcut fourchanx-icon icon-resize-full'
+ className: 'expand-all-shortcut fa fa-expand'
textContent: 'EAI'
title: 'Expand All Images'
href: 'javascript:;'
$.on @EAI, 'click', ImageExpand.cb.toggleAll
- Header.addShortcut @EAI, 2
+ Header.addShortcut @EAI, 3
Post.callbacks.push
name: 'Image Expansion'
@@ -33,11 +33,11 @@ ImageExpand =
toggleAll: ->
$.event 'CloseMenu'
if ImageExpand.on = $.hasClass ImageExpand.EAI, 'expand-all-shortcut'
- ImageExpand.EAI.className = 'contract-all-shortcut fourchanx-icon icon-resize-small'
+ ImageExpand.EAI.className = 'contract-all-shortcut fa fa-compress'
ImageExpand.EAI.title = 'Contract All Images'
func = ImageExpand.expand
else
- ImageExpand.EAI.className = 'expand-all-shortcut fourchanx-icon icon-resize-full'
+ ImageExpand.EAI.className = 'expand-all-shortcut fa fa-expand'
ImageExpand.EAI.title = 'Expand All Images'
func = ImageExpand.contract
for ID, post of g.posts
@@ -46,7 +46,7 @@ ImageExpand =
continue unless file and file.isImage and doc.contains post.nodes.root
if ImageExpand.on and
(!Conf['Expand spoilers'] and file.isSpoiler or
- Conf['Expand from here'] and file.thumb.getBoundingClientRect().top < 0)
+ Conf['Expand from here'] and Header.getTopOf(file.thumb) < 0)
continue
$.queueTask func, post
return
@@ -62,7 +62,7 @@ ImageExpand =
# Scroll back to the thumbnail when contracting the image
# to avoid being left miles away from the relevant post.
{root} = post.nodes
- rect = (if Conf['Advance on contract'] then do ->
+ {top, left} = (if Conf['Advance on contract'] then do ->
next = root
while next = $.x "following::div[contains(@class,'postContainer')][1]", next
continue if $('.stub', next) or next.offsetHeight is 0
@@ -72,13 +72,13 @@ ImageExpand =
root
).getBoundingClientRect()
- if rect.top < 0
- y = rect.top
+ if top < 0
+ y = top
if Conf['Fixed Header'] and not Conf['Bottom Header']
headRect = Header.bar.getBoundingClientRect()
y -= headRect.top + headRect.height
- if rect.left < 0
+ if left < 0
x = -window.scrollX
window.scrollBy x, y if x or y
ImageExpand.contract post
@@ -116,13 +116,12 @@ ImageExpand =
$.addClass post.nodes.root, 'expanded-image'
$.rmClass post.file.thumb, 'expanding'
return
- prev = post.nodes.root.getBoundingClientRect()
+ {bottom} = post.nodes.root.getBoundingClientRect()
$.queueTask ->
$.addClass post.nodes.root, 'expanded-image'
$.rmClass post.file.thumb, 'expanding'
- return unless prev.top + prev.height <= 0
- curr = post.nodes.root.getBoundingClientRect()
- window.scrollBy 0, curr.height - prev.height + curr.top - prev.top
+ return unless bottom <= 0
+ window.scrollBy 0, post.nodes.root.getBoundingClientRect().bottom - bottom
error: ->
post = Get.postFromNode @
diff --git a/src/Linkification/Linkify.coffee b/src/Linkification/Linkify.coffee
index 164756d07..6774be36e 100755
--- a/src/Linkification/Linkify.coffee
+++ b/src/Linkification/Linkify.coffee
@@ -288,8 +288,13 @@ Linkify =
LiveLeak:
regExp: /.*(?:liveleak.com\/view.+i=)([0-9a-z_]+)/
el: (a) ->
- $.el 'object',
- innerHTML: ""
+ el = $.el 'iframe',
+ width: "640",
+ height: "360",
+ src: "http://www.liveleak.com/ll_embed?i=#{a.dataset.uid}",
+ frameborder: "0"
+ el.setAttribute "allowfullscreen", "true"
+ el
MediaCrush:
regExp: /.*(?:mediacru.sh\/)([0-9a-z_]+)/i
@@ -298,7 +303,7 @@ Linkify =
el = $.el 'div'
$.cache "https://mediacru.sh/#{a.dataset.uid}.json", ->
{status} = @
- return div.innerHTML = "ERROR #{status}" unless [200, 304].contains status
+ return div.innerHTML = "ERROR #{status}" unless status in [200, 304]
{files} = JSON.parse @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
@@ -404,8 +409,10 @@ Linkify =
YouTube:
regExp: /.*(?:youtu.be\/|youtube.*v=|youtube.*\/embed\/|youtube.*\/v\/|youtube.*videos\/)([^#\&\?]*)\??(t\=.*)?/
el: (a) ->
- $.el 'iframe',
+ el = $.el 'iframe',
src: "//www.youtube.com/embed/#{a.dataset.uid}#{if a.dataset.option then '#' + a.dataset.option else ''}?wmode=opaque"
+ el.setAttribute "allowfullscreen", "true"
+ el
title:
api: (uid) -> "https://gdata.youtube.com/feeds/api/videos/#{uid}?alt=json&fields=title/text(),yt:noembed,app:control/yt:state/@reasonCode"
text: (data) -> data.entry.title.$t
diff --git a/src/Menu/Menu.coffee b/src/Menu/Menu.coffee
index 3589ac5b2..0cba5448f 100755
--- a/src/Menu/Menu.coffee
+++ b/src/Menu/Menu.coffee
@@ -10,18 +10,23 @@ Menu =
node: ->
if @isClone
$.on $('.menu-button', @nodes.info), 'click', Menu.toggle
- else
- $.add @nodes.info, [$.tn('\u00A0'), Menu.makeButton()]
+ return
+ $.add @nodes.info, Menu.makeButton()
makeButton: do ->
- a = $.el 'a',
- className: 'menu-button brackets-wrap'
- innerHTML: ''
- href: 'javascript:;'
+ frag = null
->
- button = a.cloneNode true
- $.on button, 'click', Menu.toggle
- button
+ unless frag?
+ frag = $.nodes [
+ $.tn(' ')
+ $.el 'a',
+ className: 'menu-button'
+ innerHTML: '[]'
+ href: 'javascript:;'
+ ]
+ clone = frag.cloneNode true
+ $.on clone.lastElementChild, 'click', Menu.toggle
+ clone
toggle: (e) ->
post = Get.postFromNode @
diff --git a/src/Miscellaneous/CatalogLinks.coffee b/src/Miscellaneous/CatalogLinks.coffee
index 48a678874..e123e537c 100755
--- a/src/Miscellaneous/CatalogLinks.coffee
+++ b/src/Miscellaneous/CatalogLinks.coffee
@@ -1,11 +1,10 @@
CatalogLinks =
init: ->
return unless Conf['Catalog Links']
- el = $.el 'label',
+ CatalogLinks.el = el = $.el 'label',
id: 'toggleCatalog'
href: 'javascript:;'
innerHTML: " Catalog Links"
- title: "Turn catalog links #{if Conf['Header catalog links'] then 'off' else 'on'}."
input = $ 'input', el
$.on input, 'change', @toggle
@@ -22,32 +21,33 @@ CatalogLinks =
toggle: ->
$.event 'CloseMenu'
- $.set 'Header catalog links', useCatalog = @checked
- CatalogLinks.set useCatalog
+ $.set 'Header catalog links', @checked
+ CatalogLinks.set @checked
set: (useCatalog) ->
path = if useCatalog then 'catalog' else ''
- for a in $$ """
- #board-list a:not(.catalog),
- #boardNavDesktopFoot a
- """
- board = a.pathname.split('/')[1]
- continue if ['f', 'status', '4chan'].contains(board) or !board
- if Conf['External Catalog']
- a.href = if useCatalog
- CatalogLinks.external board
- else
- "/#{board}/"
- else
- a.pathname = "/#{board}/#{path}"
- @title = "Turn catalog links #{if useCatalog then 'off' else 'on'}."
+
+ generateURL = if useCatalog and Conf['External Catalog']
+ CatalogLinks.external
+ else
+ (board) -> a.href = "/#{board}/#{path}"
+
+ for a in $$ """#board-list a:not(.catalog), #boardNavDesktopFoot a"""
+ continue if a.hostname not in ['boards.4chan.org', 'catalog.neet.tv', '4index.gropes.us'] or
+ !(board = a.pathname.split('/')[1]) or
+ board in ['f', 'status', '4chan']
+
+ # Href is easier than pathname because then we don't have
+ # conditions where External Catalog has been disabled between switches.
+ a.href = generateURL board
+
+ CatalogLinks.el.title = "Turn catalog links #{if useCatalog then 'off' else 'on'}."
external: (board) ->
- return (
- if ['a', 'c', 'g', 'co', 'k', 'm', 'o', 'p', 'v', 'vg', 'w', 'cm', '3', 'adv', 'an', 'cgl', 'ck', 'diy', 'fa', 'fit', 'int', 'jp', 'mlp', 'lit', 'mu', 'n', 'po', 'sci', 'toy', 'trv', 'tv', 'vp', 'x', 'q'].contains board
+ switch board
+ when 'a', 'c', 'g', 'co', 'k', 'm', 'o', 'p', 'v', 'vg', 'w', 'cm', '3', 'adv', 'an', 'cgl', 'ck', 'diy', 'fa', 'fit', 'int', 'jp', 'mlp', 'lit', 'mu', 'n', 'po', 'sci', 'toy', 'trv', 'tv', 'vp', 'x', 'q'
"http://catalog.neet.tv/#{board}"
- else if ['d', 'e', 'gif', 'h', 'hr', 'hc', 'r9k', 's', 'pol', 'soc', 'u', 'i', 'ic', 'hm', 'r', 'w', 'wg', 'wsg', 't', 'y'].contains board
+ when 'd', 'e', 'gif', 'h', 'hr', 'hc', 'r9k', 's', 'pol', 'soc', 'u', 'i', 'ic', 'hm', 'r', 'w', 'wg', 'wsg', 't', 'y'
"http://4index.gropes.us/#{board}"
else
- "/#{board}/catalog"
- )
\ No newline at end of file
+ "/#{board}/catalog"
\ No newline at end of file
diff --git a/src/Miscellaneous/ExpandComment.coffee b/src/Miscellaneous/ExpandComment.coffee
index db55f37ba..cb9223ae9 100755
--- a/src/Miscellaneous/ExpandComment.coffee
+++ b/src/Miscellaneous/ExpandComment.coffee
@@ -32,7 +32,7 @@ ExpandComment =
post.nodes.comment = post.nodes.shortComment
parse: (req, a, post) ->
{status} = req
- unless [200, 304].contains status
+ unless status in [200, 304]
a.textContent = "Error #{req.statusText} (#{status})"
return
diff --git a/src/Miscellaneous/ExpandThread.coffee b/src/Miscellaneous/ExpandThread.coffee
index a33a79ef4..3f5a1d3ed 100755
--- a/src/Miscellaneous/ExpandThread.coffee
+++ b/src/Miscellaneous/ExpandThread.coffee
@@ -1,111 +1,97 @@
ExpandThread =
init: ->
return if g.VIEW isnt 'index' or !Conf['Thread Expansion']
+ @statuses = {}
+ $.on d, 'IndexRefresh', @onIndexRefresh
- Thread.callbacks.push
- name: 'Thread Expansion'
- cb: @node
-
- node: ->
- return unless span = $.x 'following-sibling::span[contains(@class,"summary")][1]', @OP.nodes.root
- [posts, files] = span.textContent.match /\d+/g
- a = $.el 'a',
- textContent: ExpandThread.text '+', posts, files
- className: 'summary'
- href: 'javascript:;'
+ setButton: (thread) ->
+ return unless a = $.x 'following-sibling::a[contains(@class,"summary")][1]', thread.OP.nodes.root
+ a.textContent = ExpandThread.text '+', a.textContent.match(/\d+/g)...
$.on a, 'click', ExpandThread.cbToggle
- $.replace span, a
+
+ onIndexRefresh: ->
+ for threadID, status of ExpandThread.statuses
+ status.req?.abort()
+ delete ExpandThread.statuses[threadID]
+ for threadID, thread of g.BOARD.threads
+ ExpandThread.setButton thread
+ return
text: (status, posts, files) ->
"#{status} #{posts} post#{if posts > 1 then 's' else ''}" +
(if +files then " and #{files} image repl#{if files > 1 then 'ies' else 'y'}" else "") +
" #{if status is '-' then 'shown' else 'omitted'}."
- cbToggle: ->
+ cbToggle: (e) ->
+ return if e.shiftKey or e.altKey or e.ctrlKey or e.metaKey or e.button isnt 0
+ e.preventDefault()
ExpandThread.toggle Get.threadFromNode @
toggle: (thread) ->
threadRoot = thread.OP.nodes.root.parentNode
- a = $ '.summary', threadRoot
-
- switch thread.isExpanded
- when false, undefined
- for post in $$ '.thread > .postContainer', threadRoot
- ExpandComment.expand Get.postFromRoot post
- unless a
- thread.isExpanded = true
- return
- thread.isExpanded = 'loading'
- [posts, files] = a.textContent.match /\d+/g
- a.textContent = ExpandThread.text '...', posts, files
- $.cache "//a.4cdn.org/#{thread.board}/res/#{thread}.json", ->
- ExpandThread.parse @, thread, a
-
- when 'loading'
- thread.isExpanded = false
- return unless a
- [posts, files] = a.textContent.match /\d+/g
- a.textContent = ExpandThread.text '+', posts, files
-
- when true
- thread.isExpanded = false
- #goddamit moot
- num = if thread.isSticky
- 1
- else switch g.BOARD.ID
- # XXX boards config
- when 'b', 'vg' then 3
- when 't' then 1
- else 5
- posts = $$ ".thread > .replyContainer", threadRoot
- for post in [thread.OP.nodes.root].concat posts[-num..]
- ExpandComment.contract Get.postFromRoot post
- return unless a
- postsCount = 0
- filesCount = 0
- for reply in posts[...-num]
- if Conf['Quote Inlining']
- # rm clones
- inlined.click() while inlined = $ '.inlined', reply
- postsCount++
- filesCount++ if 'file' of Get.postFromRoot reply
- $.rm reply
- a.textContent = ExpandThread.text '+', postsCount, filesCount
- return
-
- parse: (req, thread, a) ->
- return if a.textContent[0] is '+'
- unless [200, 304].contains req.status
- a.textContent = "Error #{req.statusText} (#{req.status})"
- $.off a, 'click', ExpandThread.cbToggle
+ return unless a = $ '.summary', threadRoot
+ if thread.ID of ExpandThread.statuses
+ ExpandThread.contract thread, a, threadRoot
+ else
+ ExpandThread.expand thread, a, threadRoot
+ expand: (thread, a, threadRoot) ->
+ ExpandThread.statuses[thread] = status = {}
+ a.textContent = ExpandThread.text '...', a.textContent.match(/\d+/g)...
+ status.req = $.cache "//a.4cdn.org/#{thread.board}/res/#{thread}.json", ->
+ delete status.req
+ ExpandThread.parse @, thread, a
+ contract: (thread, a, threadRoot) ->
+ status = ExpandThread.statuses[thread]
+ delete ExpandThread.statuses[thread]
+ if status.req
+ status.req.abort()
+ a.textContent = ExpandThread.text '+', a.textContent.match(/\d+/g)... if a
return
- thread.isExpanded = true
+ replies = $$ '.thread > .replyContainer', threadRoot
+ if Conf['Show Replies']
+ num = if thread.isSticky
+ 1
+ else switch g.BOARD.ID
+ # XXX boards config
+ when 'b', 'vg' then 3
+ when 't' then 1
+ else 5
+ replies = replies[...-num]
+ postsCount = 0
+ filesCount = 0
+ for reply in replies
+ # rm clones
+ inlined.click() while inlined = $ '.inlined', reply if Conf['Quote Inlining']
+ postsCount++
+ filesCount++ if 'file' of Get.postFromRoot reply
+ $.rm reply
+ a.textContent = ExpandThread.text '+', postsCount, filesCount
+ parse: (req, thread, a) ->
+ if req.status not in [200, 304]
+ a.textContent = "Error #{req.statusText} (#{req.status})"
+ return
- {posts} = JSON.parse req.response
- if spoilerRange = posts.shift().custom_spoiler
- Build.spoilerRange[thread.board] = spoilerRange
+ data = JSON.parse(req.response).posts
+ Build.spoilerRange[thread.board] = data.shift().custom_spoiler
- postsObj = []
+ posts = []
postsRoot = []
filesCount = 0
- for reply in posts
- if post = thread.posts[reply.no]
+ for postData in data
+ if post = thread.posts[postData.no]
filesCount++ if 'file' of post
postsRoot.push post.nodes.root
continue
- root = Build.postFromObject reply, thread.board.ID
+ root = Build.postFromObject postData, thread.board.ID
post = new Post root, thread, thread.board
- link = $ 'a[title="Highlight this post"]', root
- link.href = "res/#{thread}#p#{post}"
- link.nextSibling.href = "res/#{thread}#q#{post}"
filesCount++ if 'file' of post
- postsObj.push post
+ posts.push post
postsRoot.push root
- Main.callbackNodes Post, postsObj
+ Main.callbackNodes Post, posts
$.after a, postsRoot
- postsCount = postsRoot.length
+ postsCount = postsRoot.length
a.textContent = ExpandThread.text '-', postsCount, filesCount
Fourchan.parseThread thread.ID, 1, postsCount
diff --git a/src/Miscellaneous/FileInfo.coffee b/src/Miscellaneous/FileInfo.coffee
index 89d694313..e58f9faef 100755
--- a/src/Miscellaneous/FileInfo.coffee
+++ b/src/Miscellaneous/FileInfo.coffee
@@ -8,7 +8,7 @@ FileInfo =
cb: @node
node: ->
return if !@file or @isClone
- @file.text.innerHTML = FileInfo.funk FileInfo, @
+ @file.text.innerHTML = "#{FileInfo.funk FileInfo, @}"
createFunc: (format) ->
code = format.replace /%(.)/g, (s, c) ->
if c of FileInfo.formatters
@@ -21,11 +21,10 @@ FileInfo =
return "#{size.toFixed()} Bytes"
i = 1 + ['KB', 'MB'].indexOf unit
size /= 1024 while i--
- size =
- if unit is 'MB'
- Math.round(size * 100) / 100
- else
- size.toFixed()
+ size = if unit is 'MB'
+ Math.round(size * 100) / 100
+ else
+ size.toFixed()
"#{size} #{unit}"
escape: (name) ->
name.replace /<|>/g, (c) ->
diff --git a/src/Miscellaneous/Fourchan.coffee b/src/Miscellaneous/Fourchan.coffee
index 64b1f4562..6f290d662 100755
--- a/src/Miscellaneous/Fourchan.coffee
+++ b/src/Miscellaneous/Fourchan.coffee
@@ -6,8 +6,9 @@ Fourchan =
if board is 'g'
$.globalEval """
window.addEventListener('prettyprint', function(e) {
- var pre = e.detail;
- pre.innerHTML = prettyPrintOne(pre.innerHTML);
+ window.dispatchEvent(new CustomEvent('prettyprint:cb', {
+ detail: prettyPrintOne(e.detail)
+ }));
}, false);
"""
Post.callbacks.push
@@ -32,9 +33,11 @@ Fourchan =
cb: @math
code: ->
return if @isClone
+ apply = (e) -> pre.innerHTML = e.detail
+ $.on window, 'prettyprint:cb', apply
for pre in $$ '.prettyprint:not(.prettyprinted)', @nodes.comment
- $.event 'prettyprint', pre, window
- $.addClass pre, 'prettyprinted'
+ $.event 'prettyprint', pre.innerHTML, window
+ $.off window, 'prettyprint:cb', apply
return
math: ->
return if @isClone or !$ '.math', @nodes.comment
diff --git a/src/Miscellaneous/Keybinds.coffee b/src/Miscellaneous/Keybinds.coffee
index 932f019f1..d81814396 100755
--- a/src/Miscellaneous/Keybinds.coffee
+++ b/src/Miscellaneous/Keybinds.coffee
@@ -2,20 +2,25 @@ Keybinds =
init: ->
return if g.VIEW is 'catalog' or !Conf['Keybinds']
+ for hotkey of Conf.hotkeys
+ $.sync hotkey, Keybinds.sync
+
init = ->
$.off d, '4chanXInitFinished', init
- $.on d, 'keydown', Keybinds.keydown
+ $.on d, 'keydown', Keybinds.keydown
for node in $$ '[accesskey]'
node.removeAttribute 'accesskey'
return
$.on d, '4chanXInitFinished', init
+ sync: (key, hotkey) ->
+ Conf[hotkey] = key
+
keydown: (e) ->
return unless key = Keybinds.keyCode e
{target} = e
- if ['INPUT', 'TEXTAREA'].contains target.nodeName
- return unless /(Esc|Alt|Ctrl|Meta)/.test key
-
+ if target.nodeName in ['INPUT', 'TEXTAREA']
+ return unless /(Esc|Alt|Ctrl|Meta|Shift\+\w{2,})/.test key
threadRoot = Nav.getThread()
if op = $ '.op', threadRoot
thread = Get.postFromNode(op).thread
@@ -59,11 +64,15 @@ Keybinds =
Keybinds.sage() if QR.nodes
when Conf['Submit QR']
QR.submit() if QR.nodes and !QR.status()
- # Thread related
+ # Index/Thread related
+ when Conf['Update']
+ switch g.VIEW
+ when 'thread'
+ ThreadUpdater.update()
+ when 'index'
+ Index.update()
when Conf['Watch']
ThreadWatcher.toggle thread
- when Conf['Update']
- ThreadUpdater.update()
# Images
when Conf['Expand image']
Keybinds.img threadRoot
@@ -72,22 +81,25 @@ Keybinds =
when Conf['Open Gallery']
Gallery.cb.toggle()
when Conf['fappeTyme']
- FappeTyme.cb.fappe()
+ FappeTyme.cb.toggle.call {name: 'fappe'}
when Conf['werkTyme']
- FappeTyme.cb.werk()
+ FappeTyme.cb.toggle.call {name: 'werk'}
# Board Navigation
when Conf['Front page']
- window.location = "/#{g.BOARD}/0#delform"
+ if g.VIEW is 'index'
+ Index.userPageNav 0
+ else
+ window.location = "/#{g.BOARD}/"
when Conf['Open front page']
- $.open "/#{g.BOARD}/#delform"
+ $.open "/#{g.BOARD}/"
when Conf['Next page']
- return if g.VIEW is 'thread'
- if form = $ '.next form'
- window.location = form.action
+ return unless g.VIEW is 'index' and Conf['Index Mode'] is 'paged'
+ $('.next button', Index.pagelist).click()
when Conf['Previous page']
- return if g.VIEW is 'thread'
- if form = $ '.prev form'
- window.location = form.action
+ return unless g.VIEW is 'index' and Conf['Index Mode'] is 'paged'
+ $('.prev button', Index.pagelist).click()
+ when Conf['Search form']
+ Index.searchInput.focus()
when Conf['Open catalog']
if Conf['External Catalog']
window.location = CatalogLinks.external(g.BOARD.ID)
@@ -114,7 +126,7 @@ Keybinds =
when Conf['Deselect reply']
Keybinds.hl 0, threadRoot
when Conf['Hide']
- ThreadHiding.toggle thread if g.VIEW is 'index'
+ ThreadHiding.toggle thread if ThreadHiding.db
when Conf['Previous Post Quoting You']
QuoteYou.cb.seek 'preceding'
when Conf['Next Post Quoting You']
@@ -200,43 +212,31 @@ Keybinds =
location.href = url
hl: (delta, thread) ->
+ postEl = $ '.reply.highlight', thread
+
unless delta
- if postEl = $ '.reply.highlight', thread
- $.rmClass postEl, 'highlight'
+ $.rmClass postEl, 'highlight' if postEl
return
- if Conf['Fixed Header'] and Conf['Bottom header']
- topMargin = 0
- else
- headRect = Header.bar.getBoundingClientRect()
- topMargin = headRect.top + headRect.height
- if postEl = $ '.reply.highlight', thread
- $.rmClass postEl, 'highlight'
- rect = postEl.getBoundingClientRect()
- if rect.bottom >= topMargin and rect.top <= doc.clientHeight # We're at least partially visible
+
+ if postEl
+ {height} = postEl.getBoundingClientRect()
+ if Header.getTopOf(postEl) >= -height and Header.getBottomOf(postEl) >= -height # We're at least partially visible
root = postEl.parentNode
- axe = if delta is +1
+ axis = if delta is +1
'following'
else
'preceding'
- next = $.x "#{axe}-sibling::div[contains(@class,'replyContainer')][1]/child::div[contains(@class,'reply')]", root
- unless next
- @focus postEl
- return
- return unless g.VIEW is 'thread' or $.x('ancestor::div[parent::div[@class="board"]]', next) is thread
- rect = next.getBoundingClientRect()
- if rect.top < 0 or rect.bottom > doc.clientHeight
- if delta is -1
- window.scrollBy 0, rect.top - topMargin
- else
- next.scrollIntoView false
+ return unless next = $.x "#{axis}-sibling::div[contains(@class,'replyContainer') and not(@hidden) and not(child::div[@class='stub'])][1]/child::div[contains(@class,'reply')]", root
+ Header.scrollToIfNeeded next, delta is +1
@focus next
+ $.rmClass postEl, 'highlight'
return
+ $.rmClass postEl, 'highlight'
replies = $$ '.reply', thread
replies.reverse() if delta is -1
for reply in replies
- rect = reply.getBoundingClientRect()
- if delta is +1 and rect.top >= topMargin or delta is -1 and rect.bottom <= doc.clientHeight
+ if delta is +1 and Header.getTopOf(reply) > 0 or delta is -1 and Header.getBottomOf(reply) > 0
@focus reply
return
diff --git a/src/Miscellaneous/Nav.coffee b/src/Miscellaneous/Nav.coffee
index cca467683..659cce4e1 100755
--- a/src/Miscellaneous/Nav.coffee
+++ b/src/Miscellaneous/Nav.coffee
@@ -38,29 +38,24 @@ Nav =
else
Nav.scroll +1
- getThread: (full) ->
- if Conf['Bottom header'] or !Conf['Fixed Header']
- topMargin = 0
- else
- headRect = Header.bar.getBoundingClientRect()
- topMargin = headRect.top + headRect.height
- threads = $$('.thread').filter (thread) ->
- thread = Get.threadFromRoot thread
- !(thread.isHidden and !thread.stub)
- for thread, i in threads
- rect = thread.getBoundingClientRect()
- if rect.bottom > topMargin # not scrolled past
- return if full then [threads, thread, i, rect, topMargin] else thread
+ getThread: ->
+ for threadRoot in $$ '.thread'
+ thread = Get.threadFromRoot threadRoot
+ continue if thread.isHidden and !thread.stub
+ if Header.getTopOf(threadRoot) >= -threadRoot.getBoundingClientRect().height # not scrolled past
+ return threadRoot
return $ '.board'
scroll: (delta) ->
- [threads, thread, i, rect, topMargin] = Nav.getThread true
- top = rect.top - topMargin
-
- # unless we're not at the beginning of the current thread
- # (and thus wanting to move to beginning)
- # or we're above the first thread and don't want to skip it
- if (delta is -1 and top > -5) or (delta is +1 and top < 5)
- top = threads[i + delta]?.getBoundingClientRect().top - topMargin
-
- window.scrollBy 0, top
+ thread = Nav.getThread()
+ axis = if delta is +1
+ 'following'
+ else
+ 'preceding'
+ if next = $.x "#{axis}-sibling::div[contains(@class,'thread') and not(@hidden)][1]", thread
+ # Unless we're not at the beginning of the current thread,
+ # and thus wanting to move to beginning,
+ # or we're above the first thread and don't want to skip it.
+ top = Header.getTopOf thread
+ thread = next if delta is +1 and top < 5 or delta is -1 and top > -5
+ Header.scrollTo thread
diff --git a/src/Miscellaneous/RelativeDates.coffee b/src/Miscellaneous/RelativeDates.coffee
index d678ecb23..810c7bceb 100755
--- a/src/Miscellaneous/RelativeDates.coffee
+++ b/src/Miscellaneous/RelativeDates.coffee
@@ -1,13 +1,17 @@
RelativeDates =
INTERVAL: $.MINUTE / 2
init: ->
- return if g.VIEW is 'catalog' or !Conf['Relative Post Dates']
-
- # Flush when page becomes visible again or when the thread updates.
- $.on d, 'visibilitychange ThreadUpdate', @flush
-
- # Start the timeout.
- @flush()
+ switch g.VIEW
+ when 'index'
+ @flush()
+ $.on d, 'visibilitychange', @flush
+ return unless Conf['Relative Post Dates']
+ when 'thread'
+ return unless Conf['Relative Post Dates']
+ @flush()
+ $.on d, 'visibilitychange ThreadUpdate', @flush if g.VIEW is 'thread'
+ else
+ return
Post.callbacks.push
name: 'Relative Post Dates'
@@ -21,7 +25,7 @@ RelativeDates =
dateEl = @nodes.date
dateEl.title = dateEl.textContent
- RelativeDates.setUpdate @
+ RelativeDates.update @
# diff is milliseconds from now.
relative: (diff, now, date) ->
@@ -71,37 +75,41 @@ RelativeDates =
return if d.hidden
now = new Date()
- update now for update in RelativeDates.stale
+ RelativeDates.update data, now for data in RelativeDates.stale
RelativeDates.stale = []
# Reset automatic flush.
clearTimeout RelativeDates.timeout
RelativeDates.timeout = setTimeout RelativeDates.flush, RelativeDates.INTERVAL
- # Create function `update()`, closed over post, that, when called
- # from `flush()`, updates the elements, and re-calls `setOwnTimeout()` to
- # re-add `update()` to the stale list later.
- setUpdate: (post) ->
- setOwnTimeout = (diff) ->
- delay = if diff < $.MINUTE
- $.SECOND - (diff + $.SECOND / 2) % $.SECOND
- else if diff < $.HOUR
- $.MINUTE - (diff + $.MINUTE / 2) % $.MINUTE
- else if diff < $.DAY
- $.HOUR - (diff + $.HOUR / 2) % $.HOUR
- else
- $.DAY - (diff + $.DAY / 2) % $.DAY
- setTimeout markStale, delay
-
- update = (now) ->
- {date} = post.info
- diff = now - date
- relative = RelativeDates.relative diff, now, date
- for singlePost in [post].concat post.clones
+ # `update()`, when called from `flush()`, updates the elements,
+ # and re-calls `setOwnTimeout()` to re-add `data` to the stale list later.
+ update: (data, now) ->
+ isPost = data instanceof Post
+ date = if isPost
+ data.info.date
+ else
+ new Date +data.dataset.utc
+ now or= new Date()
+ diff = now - date
+ relative = RelativeDates.relative diff, now, date
+ if isPost
+ for singlePost in [data].concat data.clones
singlePost.nodes.date.firstChild.textContent = relative
- setOwnTimeout diff
-
- markStale = -> RelativeDates.stale.push update
-
- # Kick off initial timeout.
- update new Date()
+ else
+ data.firstChild.textContent = relative
+ RelativeDates.setOwnTimeout diff, data
+ setOwnTimeout: (diff, data) ->
+ delay = if diff < $.MINUTE
+ $.SECOND - (diff + $.SECOND / 2) % $.SECOND
+ else if diff < $.HOUR
+ $.MINUTE - (diff + $.MINUTE / 2) % $.MINUTE
+ else if diff < $.DAY
+ $.HOUR - (diff + $.HOUR / 2) % $.HOUR
+ else
+ $.DAY - (diff + $.DAY / 2) % $.DAY
+ setTimeout RelativeDates.markStale, delay, data
+ markStale: (data) ->
+ return if data in RelativeDates.stale # We can call RelativeDates.update() multiple times.
+ return if data instanceof Post and !g.posts[data.fullID] # collected post.
+ RelativeDates.stale.push data
diff --git a/src/Monitoring/Favicon.coffee b/src/Monitoring/Favicon.coffee
index ea02b3ca2..f87879fcc 100755
--- a/src/Monitoring/Favicon.coffee
+++ b/src/Monitoring/Favicon.coffee
@@ -45,5 +45,5 @@ Favicon =
Favicon.unread = Favicon.unreadNSFW
Favicon.unreadY = Favicon.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/General/img/favicons/dead.gif", {encoding: "base64"}) %>'
+ logo: 'data:image/png;base64,<%= grunt.file.read("src/General/img/icon128.png", {encoding: "base64"}) %>'
diff --git a/src/Monitoring/ThreadUpdater.coffee b/src/Monitoring/ThreadUpdater.coffee
index 1700ac8fb..1a7be4a60 100755
--- a/src/Monitoring/ThreadUpdater.coffee
+++ b/src/Monitoring/ThreadUpdater.coffee
@@ -208,43 +208,32 @@ ThreadUpdater =
ThreadUpdater.set 'timer', '...'
else
ThreadUpdater.set 'timer', 'Update'
- ThreadUpdater.req.abort() if ThreadUpdater.req
+ ThreadUpdater.req?.abort()
url = "//a.4cdn.org/#{ThreadUpdater.thread.board}/res/#{ThreadUpdater.thread}.json"
ThreadUpdater.req = $.ajax url, onloadend: ThreadUpdater.cb.load,
whenModified: true
- updateThreadStatus: (title, OP) ->
- titleLC = title.toLowerCase()
- return if ThreadUpdater.thread["is#{title}"] is !!OP[titleLC]
- unless ThreadUpdater.thread["is#{title}"] = !!OP[titleLC]
- message = if title is 'Sticky'
- 'The thread is not a sticky anymore.'
+ updateThreadStatus: (type, status) ->
+ return unless hasChanged = ThreadUpdater.thread["is#{type}"] isnt status
+ ThreadUpdater.thread.setStatus type, status
+ change = if type is 'Sticky'
+ if status
+ 'now a sticky'
else
- 'The thread is not closed anymore.'
- new Notice 'info', message, 30
- $.rm $ ".#{titleLC}Icon", ThreadUpdater.thread.OP.nodes.info
- return
- message = if title is 'Sticky'
- 'The thread is now a sticky.'
+ 'not a sticky anymore'
else
- 'The thread is now closed.'
- new Notice 'info', message, 30
- icon = $.el 'img',
- src: "//static.4chan.org/image/#{titleLC}.gif"
- alt: title
- title: title
- className: "#{titleLC}Icon"
- root = $ '[title="Quote this post"]', ThreadUpdater.thread.OP.nodes.info
- if title is 'Closed'
- root = $('.stickyIcon', ThreadUpdater.thread.OP.nodes.info) or root
- $.after root, [$.tn(' '), icon]
+ if status
+ 'now closed'
+ else
+ 'not closed anymore'
+ new Notice 'info', "The thread is #{change}.", 30
parse: (postObjects) ->
OP = postObjects[0]
Build.spoilerRange[ThreadUpdater.thread.board] = OP.custom_spoiler
- ThreadUpdater.updateThreadStatus 'Sticky', OP
- ThreadUpdater.updateThreadStatus 'Closed', OP
+ ThreadUpdater.updateThreadStatus 'Sticky', !!OP.sticky
+ ThreadUpdater.updateThreadStatus 'Closed', !!OP.closed
ThreadUpdater.thread.postLimit = !!OP.bumplimit
ThreadUpdater.thread.fileLimit = !!OP.imagelimit
@@ -265,18 +254,20 @@ ThreadUpdater =
deletedPosts = []
deletedFiles = []
+
# Check for deleted posts/files.
for ID, post of ThreadUpdater.thread.posts
# XXX tmp fix for 4chan's racing condition
# giving us false-positive dead posts.
# continue if post.isDead
ID = +ID
- if post.isDead and index.contains ID
- post.resurrect()
- else unless index.contains ID
+
+ unless ID in index
post.kill()
deletedPosts.push post
- else if post.file and !post.file.isDead and not files.contains ID
+ else if post.isDead
+ post.resurrect()
+ else if post.file and not (post.file.isDead or ID in files)
post.kill true
deletedFiles.push post
@@ -304,7 +295,7 @@ ThreadUpdater =
continue unless posts.hasOwnProperty key
root = post.nodes.root
if post.cb
- unless post.cb.call post
+ unless post.cb()
$.add ThreadUpdater.root, root
else
$.add ThreadUpdater.root, root
@@ -313,7 +304,7 @@ ThreadUpdater =
if Conf['Bottom Scroll']
window.scrollTo 0, d.body.clientHeight
else
- Header.scrollToPost root if root
+ Header.scrollTo root if root
$.queueTask ->
# Enable 4chan features.
diff --git a/src/Monitoring/ThreadWatcher.coffee b/src/Monitoring/ThreadWatcher.coffee
index bc71c11b9..e5b63500f 100755
--- a/src/Monitoring/ThreadWatcher.coffee
+++ b/src/Monitoring/ThreadWatcher.coffee
@@ -6,12 +6,10 @@ ThreadWatcher =
id: 'watcher-link'
textContent: 'Watcher'
href: 'javascript:;'
- className: 'disabled fourchanx-icon icon-eye-open'
+ className: 'disabled fa fa-eye-open'
@db = new DataBoard 'watchedThreads', @refresh, true
- @dialog = UI.dialog 'thread-watcher', 'top: 50px; left: 0px;', """
- <%= grunt.file.read('src/General/html/Monitoring/ThreadWatcher.html').replace(/>\s+<').trim() %>
- """
+ @dialog = UI.dialog 'thread-watcher', 'top: 50px; left: 0px;', <%= importHTML('Monitoring/ThreadWatcher') %>
@status = $ '#watcher-status', @dialog
@list = @dialog.lastElementChild
@@ -19,7 +17,13 @@ ThreadWatcher =
$.on d, 'ThreadUpdate', @cb.threadUpdate if g.VIEW is 'thread'
$.on sc, 'click', @toggleWatcher
$.on $('.move>.close', ThreadWatcher.dialog), 'click', @toggleWatcher
+
$.on d, '4chanXInitFinished', @ready
+ switch g.VIEW
+ when 'index'
+ $.on d, 'IndexRefresh', @cb.onIndexRefresh
+ when 'thread'
+ $.on d, 'ThreadUpdate', @cb.onThreadRefresh
if Conf['Toggleable Thread Watcher']
Header.addShortcut sc
@@ -89,7 +93,17 @@ ThreadWatcher =
$.set 'AutoWatch', threadID
else if Conf['Auto Watch Reply']
ThreadWatcher.add board.threads[threadID]
- threadUpdate: (e) ->
+ onIndexRefresh: ->
+ {db} = ThreadWatcher
+ boardID = g.BOARD.ID
+ for threadID, data of db.data.boards[boardID] when not data.isDead and threadID not of g.BOARD.threads
+ if Conf['Auto Prune']
+ ThreadWatcher.db.delete {boardID, threadID}
+ else
+ data.isDead = true
+ ThreadWatcher.db.set {boardID, threadID, val: data}
+ ThreadWatcher.refresh()
+ onThreadRefresh: (e) ->
{thread} = e.detail
return unless e.detail[404] and ThreadWatcher.db.get {boardID: thread.board.ID, threadID: thread.ID}
# Update 404 status.
@@ -120,7 +134,7 @@ ThreadWatcher =
ThreadWatcher.status.textContent = status
return if @status isnt 404
if Conf['Auto Prune']
- ThreadWatcher.rm boardID, threadID
+ ThreadWatcher.db.delete {boardID, threadID}
else
data.isDead = true
ThreadWatcher.db.set {boardID, threadID, val: data}
@@ -139,7 +153,7 @@ ThreadWatcher =
makeLine: (boardID, threadID, data) ->
x = $.el 'a',
- textContent: '×'
+ className: 'fa fa-times'
href: 'javascript:;'
$.on x, 'click', ThreadWatcher.cb.rm
@@ -281,6 +295,7 @@ ThreadWatcher =
$.on entry.el, 'click', cb if cb
@refreshers.push refresh.bind entry if refresh
$.event 'AddMenuEntry', entry
+ return
createSubEntry: (name, desc) ->
entry =
type: 'thread watcher'
diff --git a/src/Monitoring/Unread.coffee b/src/Monitoring/Unread.coffee
index 76e3e30d0..059fa2dc6 100755
--- a/src/Monitoring/Unread.coffee
+++ b/src/Monitoring/Unread.coffee
@@ -5,7 +5,7 @@ Unread =
@db = new DataBoard 'lastReadPosts', @sync
@hr = $.el 'hr',
id: 'unread-line'
- @posts = []
+ @posts = new RandomAccessList
@postsQuotingYou = []
Thread.callbacks.push
@@ -27,32 +27,27 @@ Unread =
ready: ->
$.off d, '4chanXInitFinished', Unread.ready
posts = []
- for ID, post of Unread.thread.posts
- posts.push post if post.isReply
+ posts.push post for ID, post of Unread.thread.posts when post.isReply
Unread.addPosts posts
- Unread.scroll()
+ QuoteThreading.force() if Conf['Quote Threading']
+ Unread.scroll() if Conf['Scroll to Last Read Post']
scroll: ->
- return unless Conf['Scroll to Last Read Post']
# Let the header's onload callback handle it.
return if (hash = location.hash.match /\d+/) and hash[0] of Unread.thread.posts
- if post = Unread.posts[0]
+ if post = Unread.posts.first
# Scroll to a non-hidden, non-OP post that's before the first unread post.
while root = $.x 'preceding-sibling::div[contains(@class,"replyContainer")][1]', post.nodes.root
break unless (post = Get.postFromRoot root).isHidden
return unless root
- onload = -> root.scrollIntoView false if checkPosition root
+ down = true
else
# Scroll to the last read post.
posts = Object.keys Unread.thread.posts
{root} = Unread.thread.posts[posts[posts.length - 1]].nodes
- onload = -> Header.scrollToPost root if checkPosition root
- checkPosition = (target) ->
- # Scroll to the target unless we scrolled past it.
- target.getBoundingClientRect().bottom > doc.clientHeight
- # Prevent the browser to scroll back to
- # the previous scroll location on page load.
- $.on window, 'load', onload
+
+ # Scroll to the target unless we scrolled past it.
+ Header.scrollTo root, down if Header.getBottomOf(root) < 0
sync: ->
lastReadPost = Unread.db.get
@@ -61,7 +56,13 @@ Unread =
defaultValue: 0
return unless Unread.lastReadPost < lastReadPost
Unread.lastReadPost = lastReadPost
- Unread.readArray Unread.posts
+
+ post = Unread.posts.first
+ while post
+ break if ({ID} = post) > Unread.lastReadPost
+ post = post.next
+ Unread.posts.rm ID
+
Unread.readArray Unread.postsQuotingYou
Unread.setLine() if Conf['Unread Line']
Unread.update()
@@ -69,19 +70,16 @@ Unread =
addPosts: (posts) ->
for post in posts
{ID} = post
- if ID <= Unread.lastReadPost or post.isHidden
- continue
- if QR.db
- data =
- boardID: post.board.ID
- threadID: post.thread.ID
- postID: post.ID
- continue if QR.db.get data
- Unread.posts.push post
+ continue if ID <= Unread.lastReadPost or post.isHidden or QR.db.get {
+ boardID: post.board.ID
+ threadID: post.thread.ID
+ postID: ID
+ }
+ Unread.posts.push post unless post.prev or post.next
Unread.addPostQuotingYou post
if Conf['Unread Line']
# Force line on visible threads if there were no unread posts previously.
- Unread.setLine posts.contains Unread.posts[0]
+ Unread.setLine Unread.posts.first in posts
Unread.read()
Unread.update()
@@ -102,7 +100,7 @@ Unread =
body: post.info.comment
icon: Favicon.logo
notif.onclick = ->
- Header.scrollToPost post.nodes.root
+ Header.scrollToIfNeeded post.nodes.root, true
window.focus()
notif.onshow = ->
setTimeout ->
@@ -116,11 +114,12 @@ Unread =
Unread.addPosts e.detail.newPosts
readSinglePost: (post) ->
- return if (i = Unread.posts.indexOf post) is -1
- Unread.posts.splice i, 1
- if i is 0
- Unread.lastReadPost = post.ID
+ {ID} = post
+ return unless Unread.posts[ID]
+ if post is Unread.posts.first
+ Unread.lastReadPost = ID
Unread.saveLastReadPost()
+ Unread.posts.rm ID
if (i = Unread.postsQuotingYou.indexOf post) isnt -1
Unread.postsQuotingYou.splice i, 1
Unread.update()
@@ -130,28 +129,18 @@ Unread =
break if post.ID > Unread.lastReadPost
arr.splice 0, i
- read: $.debounce 50, (e) ->
+ read: $.debounce 100, (e) ->
return if d.hidden or !Unread.posts.length
height = doc.clientHeight
- {posts} = Unread
- i = 0
- while post = posts[i]
- if post.nodes.root.getBoundingClientRect().bottom < height # post is not completely read
- {ID} = post
- if Conf['Mark Quotes of You']
- if post.info.yours
- QuoteYou.lastRead = post.nodes.root
- if Conf['Quote Threading']
- posts.splice i, 1
- continue
- else
- unless Conf['Quote Threading']
- break
- i++
-
- if i and !Conf['Quote Threading']
- posts.splice 0, i
+ {posts} = Unread
+ while post = posts.first
+ break unless Header.getBottomOf(post.nodes.root) > -1 # post is not completely read
+ {ID} = post
+ posts.rm ID
+
+ if Conf['Mark Quotes of You'] and post.info.yours
+ QuoteYou.lastRead = post.nodes.root
return unless ID
@@ -163,13 +152,13 @@ Unread =
saveLastReadPost: $.debounce 2 * $.SECOND, ->
return if Unread.thread.isDead
Unread.db.set
- boardID: Unread.thread.board.ID
+ boardID: Unread.thread.board.ID
threadID: Unread.thread.ID
val: Unread.lastReadPost
setLine: (force) ->
return unless d.hidden or force is true
- return $.rm Unread.hr unless post = Unread.posts[0]
+ return $.rm Unread.hr unless post = Unread.posts.first
if $.x 'preceding-sibling::div[contains(@class,"replyContainer")]', post.nodes.root # not the first reply
$.before post.nodes.root, Unread.hr
@@ -177,7 +166,7 @@ Unread =
count = Unread.posts.length
if Conf['Unread Count']
- d.title = "#{if Conf['Quoted Title'] and Unread.postsQuotingYou.length then '(!) ' else ''}#{if count or !Conf['Hide Unread Count at (0)'] then "(#{count}) " else ''}#{if g.DEAD then "/#{g.BOARD}/ - 404" else "#{Unread.title}"}"
+ d.title = "#{if Conf['Quoted Title'] and Unread.postsQuotingYou.length then '(!) ' else ''}#{if count or !Conf['Hide Unread Count at (0)'] then "(#{count}) " else ''}#{if g.DEAD then "/#{g.BOARD}/ - 404" else "#{Unread.title}"}"
<% if (type === 'crx') { %>
# XXX Chrome bug where it doesn't always update the tab title.
# crbug.com/124381
diff --git a/src/Posting/QR.captcha.coffee b/src/Posting/QR.captcha.coffee
new file mode 100644
index 000000000..671ae233f
--- /dev/null
+++ b/src/Posting/QR.captcha.coffee
@@ -0,0 +1,124 @@
+QR.captcha =
+ init: ->
+ return if d.cookie.indexOf('pass_enabled=1') >= 0
+ return unless @isEnabled = !!$.id 'captchaFormPart'
+ $.asap (-> $.id 'recaptcha_challenge_field_holder'), @ready.bind @
+
+ ready: ->
+ setLifetime = (e) => @lifetime = e.detail
+ $.on window, 'captcha:timeout', setLifetime
+ $.globalEval 'window.dispatchEvent(new CustomEvent("captcha:timeout", {detail: RecaptchaState.timeout}))'
+ $.off window, 'captcha:timeout', setLifetime
+
+ imgContainer = $.el 'div',
+ className: 'captcha-img'
+ title: 'Reload reCAPTCHA'
+ innerHTML: ''
+ input = $.el 'input',
+ className: 'captcha-input field'
+ title: 'Verification'
+ autocomplete: 'off'
+ spellcheck: false
+ tabIndex: 55
+ @nodes =
+ challenge: $.id 'recaptcha_challenge_field_holder'
+ img: imgContainer.firstChild
+ input: input
+
+ new MutationObserver(@load.bind @).observe @nodes.challenge,
+ childList: true
+
+ $.on imgContainer, 'click', @reload.bind @
+ $.on input, 'keydown', @keydown.bind @
+ $.on input, 'focus', -> $.addClass QR.nodes.el, 'focus'
+ $.on input, 'blur', -> $.rmClass QR.nodes.el, 'focus'
+
+ $.get 'captchas', [], ({captchas}) =>
+ @sync captchas
+ $.sync 'captchas', @sync
+ # start with an uncached captcha
+ @reload()
+
+ <% if (type === 'userscript') { %>
+ # XXX Firefox lacks focusin/focusout support.
+ $.on input, 'blur', QR.focusout
+ $.on input, 'focus', QR.focusin
+ <% } %>
+
+ $.addClass QR.nodes.el, 'has-captcha'
+ $.after QR.nodes.com.parentNode, [imgContainer, input]
+
+ sync: (captchas) ->
+ QR.captcha.captchas = captchas
+ QR.captcha.count()
+
+ getOne: ->
+ @clear()
+ if captcha = @captchas.shift()
+ {challenge, response} = captcha
+ @count()
+ $.set 'captchas', @captchas
+ else
+ challenge = @nodes.img.alt
+ if response = @nodes.input.value then @reload()
+ if response
+ response = response.trim()
+ # one-word-captcha:
+ # If there's only one word, duplicate it.
+ response = "#{response} #{response}" unless /\s/.test response
+ {challenge, response}
+
+ save: ->
+ return unless response = @nodes.input.value.trim()
+ @captchas.push
+ challenge: @nodes.img.alt
+ response: response
+ timeout: @timeout
+ @count()
+ @reload()
+ $.set 'captchas', @captchas
+
+ clear: ->
+ now = Date.now()
+ for captcha, i in @captchas
+ break if captcha.timeout > now
+ return unless i
+ @captchas = @captchas[i..]
+ @count()
+ $.set 'captchas', @captchas
+
+ load: ->
+ return unless @nodes.challenge.firstChild
+ # -1 minute to give upload some time.
+ @timeout = Date.now() + @lifetime * $.SECOND - $.MINUTE
+ challenge = @nodes.challenge.firstChild.value
+ @nodes.img.alt = challenge
+ @nodes.img.src = "//www.google.com/recaptcha/api/image?c=#{challenge}"
+ @nodes.input.value = null
+ @clear()
+
+ count: ->
+ count = @captchas.length
+ @nodes.input.placeholder = switch count
+ when 0
+ 'Verification (Shift + Enter to cache)'
+ when 1
+ 'Verification (1 cached captcha)'
+ else
+ "Verification (#{count} cached captchas)"
+ @nodes.input.alt = count # For XTRM RICE.
+
+ reload: (focus) ->
+ # the 't' argument prevents the input from being focused
+ $.globalEval 'Recaptcha.reload("t")'
+ # Focus if we meant to.
+ @nodes.input.focus() if focus
+
+ keydown: (e) ->
+ if e.keyCode is 8 and not @nodes.input.value
+ @reload()
+ else if e.keyCode is 13 and e.shiftKey
+ @save()
+ else
+ return
+ e.preventDefault()
\ No newline at end of file
diff --git a/src/Posting/QuickReply.coffee b/src/Posting/QR.coffee
old mode 100755
new mode 100644
similarity index 51%
rename from src/Posting/QuickReply.coffee
rename to src/Posting/QR.coffee
index 50b8e33b9..b2d7fd437
--- a/src/Posting/QuickReply.coffee
+++ b/src/Posting/QR.coffee
@@ -3,10 +3,11 @@ QR =
return if !Conf['Quick Reply']
@db = new DataBoard 'yourPosts'
+ @posts = []
if Conf['QR Shortcut']
sc = $.el 'a',
- className: "qr-shortcut fourchanx-icon icon-comment #{unless Conf['Persistent QR'] then 'disabled' else ''}"
+ className: "qr-shortcut fa fa-comment-o #{unless Conf['Persistent QR'] then 'disabled' else ''}"
textContent: 'QR'
title: 'Quick Reply'
href: 'javascript:;'
@@ -65,11 +66,15 @@ QR =
$.on d, 'dragover', QR.dragOver
$.on d, 'drop', QR.dropFile
$.on d, 'dragstart dragend', QR.drag
- $.on d, 'ThreadUpdate', ->
- if g.DEAD
- QR.abort()
- else
- QR.status()
+ switch g.VIEW
+ when 'index'
+ $.on d, 'IndexRefresh', QR.generatePostableThreadsList
+ when 'thread'
+ $.on d, 'ThreadUpdate', ->
+ if g.DEAD
+ QR.abort()
+ else
+ QR.status()
node: ->
$.on $('a[title="Quote this post"]', @nodes.info), 'click', QR.quote
@@ -199,192 +204,6 @@ QR =
value
status.disabled = disabled or false
- persona:
- pwd: ''
- always: {}
- init: ->
- QR.persona.getPassword()
- $.get 'QR.personas', Conf['QR.personas'], ({'QR.personas': personas}) ->
- types =
- name: []
- email: []
- sub: []
- for item in personas.split '\n'
- QR.persona.parseItem item.trim(), types
- for type, arr of types
- QR.persona.loadPersonas type, arr
- return
-
- parseItem: (item, types) ->
- return if item[0] is '#'
- return unless match = item.match /(name|email|subject|password):"(.*)"/i
- [match, type, val] = match
-
- # Don't mix up item settings with val.
- item = item.replace match, ''
-
- boards = item.match(/boards:([^;]+)/i)?[1].toLowerCase() or 'global'
- if boards isnt 'global' and not ((boards.split ',').contains g.BOARD.ID)
- return
-
- if type is 'password'
- QR.persona.pwd = val
- return
-
- type = 'sub' if type is 'subject'
-
- if /always/i.test item
- QR.persona.always[type] = val
-
- unless types[type].contains val
- types[type].push val
-
- loadPersonas: (type, arr) ->
- list = $ "#list-#{type}", QR.nodes.el
- for val in arr when val
- $.add list, $.el 'option',
- textContent: val
- return
-
- getPassword: ->
- unless QR.persona.pwd
- QR.persona.pwd = if m = d.cookie.match /4chan_pass=([^;]+)/
- decodeURIComponent m[1]
- else if input = $.id 'postPassword'
- input.value
- else
- # If we're in a closed thread, #postPassword isn't available.
- # And since #delPassword.value is only filled on window.onload
- # we'd rather use #postPassword when we can.
- $.id('delPassword').value
- return QR.persona.pwd
-
- get: (cb) ->
- $.get 'QR.persona', {}, ({'QR.persona': persona}) ->
- cb persona
-
- set: (post) ->
- $.get 'QR.persona', {}, ({'QR.persona': persona}) ->
- persona =
- name: post.name
- email: if /^sage$/.test post.email then persona.email else post.email
- sub: if Conf['Remember Subject'] then post.sub else undefined
- flag: post.flag
- $.set 'QR.persona', persona
-
- cooldown:
- init: ->
- return unless Conf['Cooldown']
- setTimers = (e) => QR.cooldown.types = e.detail
- $.on window, 'cooldown:timers', setTimers
- $.globalEval 'window.dispatchEvent(new CustomEvent("cooldown:timers", {detail: cooldowns}))'
- QR.cooldown.types or= {} # XXX tmp workaround until all pages and the catalogs get the cooldowns var.
- $.off window, 'cooldown:timers', setTimers
- for type of QR.cooldown.types
- QR.cooldown.types[type] = +QR.cooldown.types[type]
- QR.cooldown.upSpd = 0
- QR.cooldown.upSpdAccuracy = .5
- key = "cooldown.#{g.BOARD}"
- $.get key, {}, (item) ->
- QR.cooldown.cooldowns = item[key]
- QR.cooldown.start()
- $.sync key, QR.cooldown.sync
- start: ->
- return unless Conf['Cooldown']
- return if QR.cooldown.isCounting
- QR.cooldown.isCounting = true
- QR.cooldown.count()
-
- sync: (cooldowns) ->
- # Add each cooldowns, don't overwrite everything in case we
- # still need to prune one in the current tab to auto-post.
- for id of cooldowns
- QR.cooldown.cooldowns[id] = cooldowns[id]
- QR.cooldown.start()
-
- set: (data) ->
- return unless Conf['Cooldown']
- {req, post, isReply, threadID, delay} = data
- start = if req then req.uploadEndTime else Date.now()
- if delay
- cooldown = {delay}
- else
- if post.file
- upSpd = post.file.size / ((start - req.uploadStartTime) / $.SECOND)
- QR.cooldown.upSpdAccuracy = ((upSpd > QR.cooldown.upSpd * .9) + QR.cooldown.upSpdAccuracy) / 2
- QR.cooldown.upSpd = upSpd
- cooldown = {isReply, threadID}
- QR.cooldown.cooldowns[start] = cooldown
- $.set "cooldown.#{g.BOARD}", QR.cooldown.cooldowns
- QR.cooldown.start()
-
- unset: (id) ->
- delete QR.cooldown.cooldowns[id]
- if Object.keys(QR.cooldown.cooldowns).length
- $.set "cooldown.#{g.BOARD}", QR.cooldown.cooldowns
- else
- $.delete "cooldown.#{g.BOARD}"
-
- count: ->
- unless Object.keys(QR.cooldown.cooldowns).length
- $.delete "#{g.BOARD}.cooldown"
- delete QR.cooldown.isCounting
- delete QR.cooldown.seconds
- QR.status()
- return
-
- clearTimeout QR.cooldown.timeout
- QR.cooldown.timeout = setTimeout QR.cooldown.count, $.SECOND
-
- now = Date.now()
- post = QR.posts[0]
- isReply = post.thread isnt 'new'
- hasFile = !!post.file
- seconds = null
- {types, cooldowns, upSpd, upSpdAccuracy} = QR.cooldown
-
- for start, cooldown of cooldowns
- if 'delay' of cooldown
- if cooldown.delay
- seconds = Math.max seconds, cooldown.delay--
- else
- seconds = Math.max seconds, 0
- QR.cooldown.unset start
- continue
-
- if 'timeout' of cooldown
- # XXX tmp conversion from previous cooldowns
- QR.cooldown.unset start
- continue
-
- if isReply is cooldown.isReply
- # Only cooldowns relevant to this post can set the seconds variable:
- # reply cooldown with a reply, thread cooldown with a thread
- elapsed = Math.floor (now - start) / $.SECOND
- continue if elapsed < 0 # clock changed since then?
- type = unless isReply
- 'thread'
- else if hasFile
- 'image'
- else
- 'reply'
- maxTimer = Math.max types[type] or 0, types[type + '_intra'] or 0
- unless start <= now <= start + maxTimer * $.SECOND
- QR.cooldown.unset start
- type += '_intra' if isReply and +post.thread is cooldown.threadID
- seconds = Math.max seconds, types[type] - elapsed
-
- if seconds and Conf['Cooldown Prediction'] and hasFile and upSpd
- seconds -= Math.floor post.file.size / upSpd * upSpdAccuracy
- seconds = if seconds > 0 then seconds else 0
- # Update the status when we change posting type.
- # Don't get stuck at some random number.
- # Don't interfere with progress status updates.
- update = seconds isnt null or !!QR.cooldown.seconds
- QR.cooldown.seconds = seconds
- QR.status() if update
- QR.submit() if seconds is 0 and QR.cooldown.auto and !QR.req
-
quote: (e) ->
e?.preventDefault()
return unless QR.postingIsEnabled
@@ -471,7 +290,7 @@ QR =
if file.size > max
QR.error "#{file.name}: File too large (file: #{$.bytesToString file.size}, max: #{$.bytesToString max})."
return
- else unless QR.mimeTypes.contains file.type
+ else unless file.type in QR.mimeTypes
unless /^text/.test file.type
QR.error "#{file.name}: Unsupported file type."
return
@@ -495,408 +314,32 @@ QR =
$.addClass QR.nodes.filename, 'edit'
QR.nodes.filename.focus()
return $.on QR.nodes.filename, 'blur', -> $.rmClass QR.nodes.filename, 'edit'
- return if e.target.nodeName is 'INPUT' or (e.keyCode and not [32, 13].contains e.keyCode) or e.ctrlKey
+ return if e.target.nodeName is 'INPUT' or (e.keyCode and e.keyCode not in [32, 13]) or e.ctrlKey
e.preventDefault()
QR.nodes.fileInput.click()
- posts: []
-
- post: class
- constructor: (select) ->
- el = $.el 'a',
- className: 'qr-preview'
- draggable: true
- href: 'javascript:;'
- innerHTML: '×'
-
- @nodes =
- el: el
- rm: el.firstChild
- label: $ 'label', el
- spoiler: $ 'input', el
- span: el.lastChild
-
- <% if (type === 'userscript') { %>
- # XXX Firefox lacks focusin/focusout support.
- for elm in $$ '*', el
- $.on elm, 'blur', QR.focusout
- $.on elm, 'focus', QR.focusin
- <% } %>
- $.on el, 'click', @select
- $.on @nodes.rm, 'click', (e) => e.stopPropagation(); @rm()
- $.on @nodes.label, 'click', (e) => e.stopPropagation()
- $.on @nodes.spoiler, 'change', (e) =>
- @spoiler = e.target.checked
- QR.nodes.spoiler.checked = @spoiler if @ is QR.selected
- $.add QR.nodes.dumpList, el
-
- for event in ['dragStart', 'dragEnter', 'dragLeave', 'dragOver', 'dragEnd', 'drop']
- $.on el, event.toLowerCase(), @[event]
-
- @thread = if g.VIEW is 'thread'
- g.THREADID
- else
- 'new'
-
- prev = QR.posts[QR.posts.length - 1]
- QR.posts.push @
- @nodes.spoiler.checked = @spoiler = if prev and Conf['Remember Spoiler']
- prev.spoiler
- else
- false
- QR.persona.get (persona) =>
- @name = if 'name' of QR.persona.always
- QR.persona.always.name
- else if prev
- prev.name
- else
- persona.name
-
- @email = if 'email' of QR.persona.always
- QR.persona.always.email
- else if prev and !/^sage$/.test prev.email
- prev.email
- else
- persona.email
-
- @sub = if 'sub' of QR.persona.always
- QR.persona.always.sub
- else if Conf['Remember Subject']
- if prev then prev.sub else persona.sub
- else
- ''
-
- if QR.nodes.flag
- @flag = if prev
- prev.flag
- else
- persona.flag
- @load() if QR.selected is @ # load persona
- @select() if select
- @unlock()
-
- rm: ->
- @delete()
- index = QR.posts.indexOf @
- if QR.posts.length is 1
- new QR.post true
- $.rmClass QR.nodes.el, 'dump'
- else if @ is QR.selected
- (QR.posts[index-1] or QR.posts[index+1]).select()
- QR.posts.splice index, 1
- QR.status()
- delete: ->
- $.rm @nodes.el
- URL.revokeObjectURL @URL
-
- lock: (lock=true) ->
- @isLocked = lock
- return unless @ is QR.selected
- for name in ['thread', 'name', 'email', 'sub', 'com', 'fileButton', 'filename', 'spoiler', 'flag'] when node = QR.nodes[name]
- node.disabled = lock
- @nodes.rm.style.visibility = if lock then 'hidden' else ''
- (if lock then $.off else $.on) QR.nodes.filename.previousElementSibling, 'click', QR.openFileInput
- @nodes.spoiler.disabled = lock
- @nodes.el.draggable = !lock
-
- unlock: ->
- @lock false
-
- select: =>
- if QR.selected
- QR.selected.nodes.el.id = null
- QR.selected.forceSave()
- QR.selected = @
- @lock @isLocked
- @nodes.el.id = 'selected'
- # Scroll the list to center the focused post.
- rectEl = @nodes.el.getBoundingClientRect()
- rectList = @nodes.el.parentNode.getBoundingClientRect()
- @nodes.el.parentNode.scrollLeft += rectEl.left + rectEl.width/2 - rectList.left - rectList.width/2
- @load()
- $.event 'QRPostSelection', @
-
- load: ->
- # Load this post's values.
- for name in ['thread', 'name', 'email', 'sub', 'com', 'filename', 'flag']
- continue unless node = QR.nodes[name]
- node.value = @[name] or node.dataset.default or null
- @showFileData()
- QR.characterCount()
-
- save: (input) ->
- if input.type is 'checkbox'
- @spoiler = input.checked
- return
- {name} = input.dataset
- @[name] = input.value or input.dataset.default or null
- switch name
- when 'thread'
- QR.status()
- when 'com'
- @nodes.span.textContent = @com
- QR.characterCount()
- # Disable auto-posting if you're typing in the first post
- # during the last 5 seconds of the cooldown.
- if QR.cooldown.auto and @ is QR.posts[0] and 0 < QR.cooldown.seconds <= 5
- QR.cooldown.auto = false
- when 'filename'
- return unless @file
- @file.newName = @filename.replace /[/\\]/g, '-'
- unless /\.(jpe?g|png|gif|pdf|swf)$/i.test @filename
- # 4chan will truncate the filename if it has no extension,
- # but it will always replace the extension by the correct one,
- # so we suffix it with '.jpg' when needed.
- @file.newName += '.jpg'
- @updateFilename()
-
- forceSave: ->
- return unless @ is QR.selected
- # Do this in case people use extensions
- # that do not trigger the `input` event.
- for name in ['thread', 'name', 'email', 'sub', 'com', 'filename', 'spoiler', 'flag']
- continue unless node = QR.nodes[name]
- @save node
- return
-
- setFile: (@file) ->
- @filename = file.name
- @filesize = $.bytesToString file.size
- @nodes.label.hidden = false if QR.spoiler
- URL.revokeObjectURL @URL
- @showFileData() if @ is QR.selected
- unless /^image/.test file.type
- @nodes.el.style.backgroundImage = null
- return
- @setThumbnail()
-
- setThumbnail: ->
- # Create a redimensioned thumbnail.
- img = $.el 'img'
-
- img.onload = =>
- # Generate thumbnails only if they're really big.
- # Resized pictures through canvases look like ass,
- # so we generate thumbnails `s` times bigger then expected
- # to avoid crappy resized quality.
- s = 90*2
- s *= 3 if @file.type is 'image/gif' # let them animate
- {height, width} = img
- if height < s or width < s
- @URL = fileURL
- @nodes.el.style.backgroundImage = "url(#{@URL})"
- return
- if height <= width
- width = s / height * width
- height = s
- else
- height = s / width * height
- width = s
- cv = $.el 'canvas'
- cv.height = img.height = height
- cv.width = img.width = width
- cv.getContext('2d').drawImage img, 0, 0, width, height
- URL.revokeObjectURL fileURL
- cv.toBlob (blob) =>
- @URL = URL.createObjectURL blob
- @nodes.el.style.backgroundImage = "url(#{@URL})"
-
- fileURL = URL.createObjectURL @file
- img.src = fileURL
-
- rmFile: ->
- return if @isLocked
- delete @file
- delete @filename
- delete @filesize
- @nodes.el.title = null
- QR.nodes.fileContainer.title = ''
- @nodes.el.style.backgroundImage = null
- @nodes.label.hidden = true if QR.spoiler
- @showFileData()
- URL.revokeObjectURL @URL
-
- updateFilename: ->
- long = "#{@filename} (#{@filesize})\nCtrl+click to edit filename. Shift+click to clear."
- @nodes.el.title = long
- return unless @ is QR.selected
- QR.nodes.fileContainer.title = long
-
- showFileData: ->
- if @file
- @updateFilename()
- QR.nodes.filename.value = @filename
- QR.nodes.spoiler.checked = @spoiler
- $.addClass QR.nodes.fileSubmit, 'has-file'
- else
- $.rmClass QR.nodes.fileSubmit, 'has-file'
-
- pasteText: (file) ->
- reader = new FileReader()
- reader.onload = (e) =>
- text = e.target.result
- if @com
- @com += "\n#{text}"
- else
- @com = text
- if QR.selected is @
- QR.nodes.com.value = @com
- @nodes.span.textContent = @com
- reader.readAsText file
-
- dragStart: (e) ->
- e.dataTransfer.setDragImage @, e.layerX, e.layerY
- $.addClass @, 'drag'
- dragEnd: -> $.rmClass @, 'drag'
- dragEnter: -> $.addClass @, 'over'
- dragLeave: -> $.rmClass @, 'over'
-
- dragOver: (e) ->
- e.preventDefault()
- e.dataTransfer.dropEffect = 'move'
-
- drop: ->
- $.rmClass @, 'over'
- return unless @draggable
- el = $ '.drag', @parentNode
- index = (el) -> [el.parentNode.children...].indexOf el
- oldIndex = index el
- newIndex = index @
- (if oldIndex < newIndex then $.after else $.before) @, el
- post = QR.posts.splice(oldIndex, 1)[0]
- QR.posts.splice newIndex, 0, post
- QR.status()
-
- captcha:
- init: ->
- return if d.cookie.indexOf('pass_enabled=1') >= 0
- return unless @isEnabled = !!$.id 'captchaFormPart'
- $.asap (-> $.id 'recaptcha_challenge_field_holder'), @ready.bind @
-
- ready: ->
- setLifetime = (e) => @lifetime = e.detail
- $.on window, 'captcha:timeout', setLifetime
- $.globalEval 'window.dispatchEvent(new CustomEvent("captcha:timeout", {detail: RecaptchaState.timeout}))'
- $.off window, 'captcha:timeout', setLifetime
-
- imgContainer = $.el 'div',
- className: 'captcha-img'
- title: 'Reload'
- innerHTML: ''
- input = $.el 'input',
- className: 'captcha-input field'
- title: 'Verification'
- autocomplete: 'off'
- spellcheck: false
- tabIndex: 55
- @nodes =
- challenge: $.id 'recaptcha_challenge_field_holder'
- img: imgContainer.firstChild
- input: input
-
- new MutationObserver(@load.bind @).observe @nodes.challenge,
- childList: true
-
- $.on imgContainer, 'click', @reload.bind @
- $.on input, 'keydown', @keydown.bind @
- $.on input, 'focus', -> $.addClass QR.nodes.el, 'focus'
- $.on input, 'blur', -> $.rmClass QR.nodes.el, 'focus'
-
- $.get 'captchas', [], ({captchas}) =>
- @sync captchas
- $.sync 'captchas', @sync
- # start with an uncached captcha
- @reload()
-
- <% if (type === 'userscript') { %>
- # XXX Firefox lacks focusin/focusout support.
- $.on input, 'blur', QR.focusout
- $.on input, 'focus', QR.focusin
- <% } %>
-
- $.addClass QR.nodes.el, 'has-captcha'
- $.after QR.nodes.com.parentNode, [imgContainer, input]
-
- sync: (captchas) ->
- QR.captcha.captchas = captchas
- QR.captcha.count()
-
- getOne: ->
- @clear()
- if captcha = @captchas.shift()
- {challenge, response} = captcha
- @count()
- $.set 'captchas', @captchas
- else
- challenge = @nodes.img.alt
- if response = @nodes.input.value then @reload()
- if response
- response = response.trim()
- # one-word-captcha:
- # If there's only one word, duplicate it.
- response = "#{response} #{response}" unless /\s/.test response
- {challenge, response}
-
- save: ->
- return unless response = @nodes.input.value.trim()
- @captchas.push
- challenge: @nodes.img.alt
- response: response
- timeout: @timeout
- @count()
- @reload()
- $.set 'captchas', @captchas
-
- clear: ->
- now = Date.now()
- for captcha, i in @captchas
- break if captcha.timeout > now
- return unless i
- @captchas = @captchas[i..]
- @count()
- $.set 'captchas', @captchas
-
- load: ->
- return unless @nodes.challenge.firstChild
- # -1 minute to give upload some time.
- @timeout = Date.now() + @lifetime * $.SECOND - $.MINUTE
- challenge = @nodes.challenge.firstChild.value
- @nodes.img.alt = challenge
- @nodes.img.src = "//www.google.com/recaptcha/api/image?c=#{challenge}"
- @nodes.input.value = null
- @clear()
-
- count: ->
- count = @captchas.length
- @nodes.input.placeholder = switch count
- when 0
- 'Verification (Shift + Enter to cache)'
- when 1
- 'Verification (1 cached captcha)'
- else
- "Verification (#{count} cached captchas)"
- @nodes.input.alt = count
-
- reload: (focus) ->
- # the 't' argument prevents the input from being focused
- $.globalEval 'Recaptcha.reload("t")'
- # Focus if we meant to.
- @nodes.input.focus() if focus
-
- keydown: (e) ->
- if e.keyCode is 8 and not @nodes.input.value
- @reload()
- else if e.keyCode is 13 and e.shiftKey
- @save()
- else
- return
- e.preventDefault()
+ generatePostableThreadsList: ->
+ return unless QR.nodes
+ list = QR.nodes.thread
+ options = [list.firstChild]
+ for thread of g.BOARD.threads
+ options.push $.el 'option',
+ value: thread
+ textContent: "Thread No.#{thread}"
+ val = list.value
+ $.rmAll list
+ $.add list, options
+ list.value = val
+ return unless list.value
+ # Fix the value if the option disappeared.
+ list.value = if g.VIEW is 'thread'
+ g.THREADID
+ else
+ 'new'
dialog: ->
QR.nodes = nodes =
- el: dialog = UI.dialog 'qr', 'top:0;right:0;', """
- <%= grunt.file.read('src/General/html/Features/QuickReply.html').replace(/>\s+<').trim() %>
- """
+ el: dialog = UI.dialog 'qr', 'top:0;right:0;', <%= importHTML('Features/QuickReply') %>
nodes[key] = $ value, dialog for key, value of {
move: '.move'
@@ -964,12 +407,6 @@ QR =
nodes.flag.dataset.default = '0'
$.add nodes.form, nodes.flag
- # Make a list of threads.
- for thread of g.BOARD.threads
- $.add nodes.thread, $.el 'option',
- value: thread
- textContent: "Thread No.#{thread}"
-
$.on nodes.filename.parentNode, 'click keydown', QR.openFileInput
<% if (type === 'userscript') { %>
@@ -1011,6 +448,7 @@ QR =
$.set 'QR Size', @style.cssText
<% } %>
+ QR.generatePostableThreadsList()
QR.persona.init()
new QR.post true
QR.status()
diff --git a/src/Posting/QR.cooldown.coffee b/src/Posting/QR.cooldown.coffee
new file mode 100644
index 000000000..31201fec2
--- /dev/null
+++ b/src/Posting/QR.cooldown.coffee
@@ -0,0 +1,106 @@
+QR.cooldown =
+ init: ->
+ return unless Conf['Cooldown']
+ setTimers = (e) => QR.cooldown.types = e.detail
+ $.on window, 'cooldown:timers', setTimers
+ $.globalEval 'window.dispatchEvent(new CustomEvent("cooldown:timers", {detail: cooldowns}))'
+ $.off window, 'cooldown:timers', setTimers
+ for type of QR.cooldown.types
+ QR.cooldown.types[type] = +QR.cooldown.types[type]
+ QR.cooldown.upSpd = 0
+ QR.cooldown.upSpdAccuracy = .5
+ key = "cooldown.#{g.BOARD}"
+ $.get key, {}, (item) ->
+ QR.cooldown.cooldowns = item[key]
+ QR.cooldown.start()
+ $.sync key, QR.cooldown.sync
+ start: ->
+ return unless Conf['Cooldown']
+ return if QR.cooldown.isCounting
+ QR.cooldown.isCounting = true
+ QR.cooldown.count()
+
+ sync: (cooldowns) ->
+ # Add each cooldowns, don't overwrite everything in case we
+ # still need to prune one in the current tab to auto-post.
+ for id of cooldowns
+ QR.cooldown.cooldowns[id] = cooldowns[id]
+ QR.cooldown.start()
+
+ set: (data) ->
+ return unless Conf['Cooldown']
+ {req, post, isReply, threadID, delay} = data
+ start = if req then req.uploadEndTime else Date.now()
+ if delay
+ cooldown = {delay}
+ else
+ if post.file
+ upSpd = post.file.size / ((start - req.uploadStartTime) / $.SECOND)
+ QR.cooldown.upSpdAccuracy = ((upSpd > QR.cooldown.upSpd * .9) + QR.cooldown.upSpdAccuracy) / 2
+ QR.cooldown.upSpd = upSpd
+ cooldown = {isReply, threadID}
+ QR.cooldown.cooldowns[start] = cooldown
+ $.set "cooldown.#{g.BOARD}", QR.cooldown.cooldowns
+ QR.cooldown.start()
+
+ unset: (id) ->
+ delete QR.cooldown.cooldowns[id]
+ if Object.keys(QR.cooldown.cooldowns).length
+ $.set "cooldown.#{g.BOARD}", QR.cooldown.cooldowns
+ else
+ $.delete "cooldown.#{g.BOARD}"
+
+ count: ->
+ unless Object.keys(QR.cooldown.cooldowns).length
+ $.delete "#{g.BOARD}.cooldown"
+ delete QR.cooldown.isCounting
+ delete QR.cooldown.seconds
+ QR.status()
+ return
+
+ clearTimeout QR.cooldown.timeout
+ QR.cooldown.timeout = setTimeout QR.cooldown.count, $.SECOND
+
+ now = Date.now()
+ post = QR.posts[0]
+ isReply = post.thread isnt 'new'
+ hasFile = !!post.file
+ seconds = null
+ {types, cooldowns, upSpd, upSpdAccuracy} = QR.cooldown
+
+ for start, cooldown of cooldowns
+ if 'delay' of cooldown
+ if cooldown.delay
+ seconds = Math.max seconds, cooldown.delay--
+ else
+ seconds = Math.max seconds, 0
+ QR.cooldown.unset start
+ continue
+
+ if isReply is cooldown.isReply
+ # Only cooldowns relevant to this post can set the seconds variable:
+ # reply cooldown with a reply, thread cooldown with a thread
+ elapsed = Math.floor (now - start) / $.SECOND
+ continue if elapsed < 0 # clock changed since then?
+ type = unless isReply
+ 'thread'
+ else if hasFile
+ 'image'
+ else
+ 'reply'
+ maxTimer = Math.max types[type] or 0, types[type + '_intra'] or 0
+ unless start <= now <= start + maxTimer * $.SECOND
+ QR.cooldown.unset start
+ type += '_intra' if isReply and +post.thread is cooldown.threadID
+ seconds = Math.max seconds, types[type] - elapsed
+
+ if seconds and Conf['Cooldown Prediction'] and hasFile and upSpd
+ seconds -= Math.floor post.file.size / upSpd * upSpdAccuracy
+ seconds = if seconds > 0 then seconds else 0
+ # Update the status when we change posting type.
+ # Don't get stuck at some random number.
+ # Don't interfere with progress status updates.
+ update = seconds isnt null or !!QR.cooldown.seconds
+ QR.cooldown.seconds = seconds
+ QR.status() if update
+ QR.submit() if seconds is 0 and QR.cooldown.auto and !QR.req
\ No newline at end of file
diff --git a/src/Posting/QR.persona.coffee b/src/Posting/QR.persona.coffee
new file mode 100644
index 000000000..35238d27d
--- /dev/null
+++ b/src/Posting/QR.persona.coffee
@@ -0,0 +1,72 @@
+QR.persona =
+ pwd: ''
+ always: {}
+ init: ->
+ QR.persona.getPassword()
+ $.get 'QR.personas', Conf['QR.personas'], ({'QR.personas': personas}) ->
+ types =
+ name: []
+ email: []
+ sub: []
+ for item in personas.split '\n'
+ QR.persona.parseItem item.trim(), types
+ for type, arr of types
+ QR.persona.loadPersonas type, arr
+ return
+
+ parseItem: (item, types) ->
+ return if item[0] is '#'
+ return unless match = item.match /(name|email|subject|password):"(.*)"/i
+ [match, type, val] = match
+
+ # Don't mix up item settings with val.
+ item = item.replace match, ''
+
+ boards = item.match(/boards:([^;]+)/i)?[1].toLowerCase() or 'global'
+ return if boards isnt 'global' and g.BOARD.ID not in boards.split ','
+
+
+ if type is 'password'
+ QR.persona.pwd = val
+ return
+
+ type = 'sub' if type is 'subject'
+
+ if /always/i.test item
+ QR.persona.always[type] = val
+
+ unless val in types[type]
+ types[type].push val
+
+ loadPersonas: (type, arr) ->
+ list = $ "#list-#{type}", QR.nodes.el
+ for val in arr when val
+ $.add list, $.el 'option',
+ textContent: val
+ return
+
+ getPassword: ->
+ unless QR.persona.pwd
+ QR.persona.pwd = if m = d.cookie.match /4chan_pass=([^;]+)/
+ decodeURIComponent m[1]
+ else if input = $.id 'postPassword'
+ input.value
+ else
+ # If we're in a closed thread, #postPassword isn't available.
+ # And since #delPassword.value is only filled on window.onload
+ # we'd rather use #postPassword when we can.
+ $.id('delPassword').value
+ return QR.persona.pwd
+
+ get: (cb) ->
+ $.get 'QR.persona', {}, ({'QR.persona': persona}) ->
+ cb persona
+
+ set: (post) ->
+ $.get 'QR.persona', {}, ({'QR.persona': persona}) ->
+ persona =
+ name: post.name
+ email: if /^sage$/.test post.email then persona.email else post.email
+ sub: if Conf['Remember Subject'] then post.sub else undefined
+ flag: post.flag
+ $.set 'QR.persona', persona
diff --git a/src/Posting/QR.post.coffee b/src/Posting/QR.post.coffee
new file mode 100644
index 000000000..3345a864f
--- /dev/null
+++ b/src/Posting/QR.post.coffee
@@ -0,0 +1,265 @@
+QR.post = class
+ constructor: (select) ->
+ el = $.el 'a',
+ className: 'qr-preview'
+ draggable: true
+ href: 'javascript:;'
+ innerHTML: ''
+
+ @nodes =
+ el: el
+ rm: el.firstChild
+ label: $ 'label', el
+ spoiler: $ 'input', el
+ span: el.lastChild
+
+ <% if (type === 'userscript') { %>
+ # XXX Firefox lacks focusin/focusout support.
+ for elm in $$ '*', el
+ $.on elm, 'blur', QR.focusout
+ $.on elm, 'focus', QR.focusin
+ <% } %>
+ $.on el, 'click', @select
+ $.on @nodes.rm, 'click', (e) => e.stopPropagation(); @rm()
+ $.on @nodes.label, 'click', (e) => e.stopPropagation()
+ $.on @nodes.spoiler, 'change', (e) =>
+ @spoiler = e.target.checked
+ QR.nodes.spoiler.checked = @spoiler if @ is QR.selected
+ $.add QR.nodes.dumpList, el
+
+ for event in ['dragStart', 'dragEnter', 'dragLeave', 'dragOver', 'dragEnd', 'drop']
+ $.on el, event.toLowerCase(), @[event]
+
+ @thread = if g.VIEW is 'thread'
+ g.THREADID
+ else
+ 'new'
+
+ prev = QR.posts[QR.posts.length - 1]
+ QR.posts.push @
+ @nodes.spoiler.checked = @spoiler = if prev and Conf['Remember Spoiler']
+ prev.spoiler
+ else
+ false
+ QR.persona.get (persona) =>
+ @name = if 'name' of QR.persona.always
+ QR.persona.always.name
+ else if prev
+ prev.name
+ else
+ persona.name
+
+ @email = if 'email' of QR.persona.always
+ QR.persona.always.email
+ else if prev and !/^sage$/.test prev.email
+ prev.email
+ else
+ persona.email
+
+ @sub = if 'sub' of QR.persona.always
+ QR.persona.always.sub
+ else if Conf['Remember Subject']
+ if prev then prev.sub else persona.sub
+ else
+ ''
+
+ if QR.nodes.flag
+ @flag = if prev
+ prev.flag
+ else
+ persona.flag
+ @load() if QR.selected is @ # load persona
+ @select() if select
+ @unlock()
+
+ rm: ->
+ @delete()
+ index = QR.posts.indexOf @
+ if QR.posts.length is 1
+ new QR.post true
+ $.rmClass QR.nodes.el, 'dump'
+ else if @ is QR.selected
+ (QR.posts[index-1] or QR.posts[index+1]).select()
+ QR.posts.splice index, 1
+ QR.status()
+ delete: ->
+ $.rm @nodes.el
+ URL.revokeObjectURL @URL
+
+ lock: (lock=true) ->
+ @isLocked = lock
+ return unless @ is QR.selected
+ for name in ['thread', 'name', 'email', 'sub', 'com', 'fileButton', 'filename', 'spoiler', 'flag'] when node = QR.nodes[name]
+ node.disabled = lock
+ @nodes.rm.style.visibility = if lock then 'hidden' else ''
+ (if lock then $.off else $.on) QR.nodes.filename.previousElementSibling, 'click', QR.openFileInput
+ @nodes.spoiler.disabled = lock
+ @nodes.el.draggable = !lock
+
+ unlock: ->
+ @lock false
+
+ select: =>
+ if QR.selected
+ QR.selected.nodes.el.id = null
+ QR.selected.forceSave()
+ QR.selected = @
+ @lock @isLocked
+ @nodes.el.id = 'selected'
+ # Scroll the list to center the focused post.
+ rectEl = @nodes.el.getBoundingClientRect()
+ rectList = @nodes.el.parentNode.getBoundingClientRect()
+ @nodes.el.parentNode.scrollLeft += rectEl.left + rectEl.width/2 - rectList.left - rectList.width/2
+ @load()
+ $.event 'QRPostSelection', @
+
+ load: ->
+ # Load this post's values.
+ for name in ['thread', 'name', 'email', 'sub', 'com', 'filename', 'flag']
+ continue unless node = QR.nodes[name]
+ node.value = @[name] or node.dataset.default or null
+ @showFileData()
+ QR.characterCount()
+
+ save: (input) ->
+ if input.type is 'checkbox'
+ @spoiler = input.checked
+ return
+ {name} = input.dataset
+ @[name] = input.value or input.dataset.default or null
+ switch name
+ when 'thread'
+ QR.status()
+ when 'com'
+ @nodes.span.textContent = @com
+ QR.characterCount()
+ # Disable auto-posting if you're typing in the first post
+ # during the last 5 seconds of the cooldown.
+ if QR.cooldown.auto and @ is QR.posts[0] and 0 < QR.cooldown.seconds <= 5
+ QR.cooldown.auto = false
+ when 'filename'
+ return unless @file
+ @file.newName = @filename.replace /[/\\]/g, '-'
+ unless /\.(jpe?g|png|gif|pdf|swf)$/i.test @filename
+ # 4chan will truncate the filename if it has no extension,
+ # but it will always replace the extension by the correct one,
+ # so we suffix it with '.jpg' when needed.
+ @file.newName += '.jpg'
+ @updateFilename()
+
+ forceSave: ->
+ return unless @ is QR.selected
+ # Do this in case people use extensions
+ # that do not trigger the `input` event.
+ for name in ['thread', 'name', 'email', 'sub', 'com', 'filename', 'spoiler', 'flag']
+ continue unless node = QR.nodes[name]
+ @save node
+ return
+
+ setFile: (@file) ->
+ @filename = file.name
+ @filesize = $.bytesToString file.size
+ @nodes.label.hidden = false if QR.spoiler
+ URL.revokeObjectURL @URL
+ @showFileData() if @ is QR.selected
+ unless /^image/.test file.type
+ @nodes.el.style.backgroundImage = null
+ return
+ @setThumbnail()
+
+ setThumbnail: ->
+ # Create a redimensioned thumbnail.
+ img = $.el 'img'
+
+ img.onload = =>
+ # Generate thumbnails only if they're really big.
+ # Resized pictures through canvases look like ass,
+ # so we generate thumbnails `s` times bigger then expected
+ # to avoid crappy resized quality.
+ s = 90 * 2 * window.devicePixelRatio
+ s *= 3 if @file.type is 'image/gif' # let them animate
+ {height, width} = img
+ if height < s or width < s
+ @URL = fileURL
+ @nodes.el.style.backgroundImage = "url(#{@URL})"
+ return
+ if height <= width
+ width = s / height * width
+ height = s
+ else
+ height = s / width * height
+ width = s
+ cv = $.el 'canvas'
+ cv.height = img.height = height
+ cv.width = img.width = width
+ cv.getContext('2d').drawImage img, 0, 0, width, height
+ URL.revokeObjectURL fileURL
+ cv.toBlob (blob) =>
+ @URL = URL.createObjectURL blob
+ @nodes.el.style.backgroundImage = "url(#{@URL})"
+
+ fileURL = URL.createObjectURL @file
+ img.src = fileURL
+
+ rmFile: ->
+ return if @isLocked
+ delete @file
+ delete @filename
+ delete @filesize
+ @nodes.el.title = null
+ QR.nodes.fileContainer.title = ''
+ @nodes.el.style.backgroundImage = null
+ @nodes.label.hidden = true if QR.spoiler
+ @showFileData()
+ URL.revokeObjectURL @URL
+
+ updateFilename: ->
+ long = "#{@filename} (#{@filesize})\nCtrl+click to edit filename. Shift+click to clear."
+ @nodes.el.title = long
+ return unless @ is QR.selected
+ QR.nodes.fileContainer.title = long
+
+ showFileData: ->
+ if @file
+ @updateFilename()
+ QR.nodes.filename.value = @filename
+ QR.nodes.spoiler.checked = @spoiler
+ $.addClass QR.nodes.fileSubmit, 'has-file'
+ else
+ $.rmClass QR.nodes.fileSubmit, 'has-file'
+
+ pasteText: (file) ->
+ reader = new FileReader()
+ reader.onload = (e) =>
+ text = e.target.result
+ if @com
+ @com += "\n#{text}"
+ else
+ @com = text
+ if QR.selected is @
+ QR.nodes.com.value = @com
+ @nodes.span.textContent = @com
+ reader.readAsText file
+
+ dragStart: (e) ->
+ e.dataTransfer.setDragImage @, e.layerX, e.layerY
+ $.addClass @, 'drag'
+ dragEnd: -> $.rmClass @, 'drag'
+ dragEnter: -> $.addClass @, 'over'
+ dragLeave: -> $.rmClass @, 'over'
+
+ dragOver: (e) ->
+ e.preventDefault()
+ e.dataTransfer.dropEffect = 'move'
+
+ drop: ->
+ $.rmClass @, 'over'
+ return unless @draggable
+ el = $ '.drag', @parentNode
+ index = (el) -> [el.parentNode.children...].indexOf el
+ oldIndex = index el
+ newIndex = index @
+ (if oldIndex < newIndex then $.after else $.before) @, el
+ post = QR.posts.splice(oldIndex, 1)[0]
+ QR.posts.splice newIndex, 0, post
+ QR.status()
\ No newline at end of file
diff --git a/src/Quotelinks/QuoteOP.coffee b/src/Quotelinks/QuoteOP.coffee
index 1f5554dfe..33b680112 100755
--- a/src/Quotelinks/QuoteOP.coffee
+++ b/src/Quotelinks/QuoteOP.coffee
@@ -19,7 +19,7 @@ QuoteOP =
{quotelinks} = @nodes
# rm (OP) from cross-thread quotes.
- if @isClone and quotes.contains @thread.fullID
+ if @isClone and @thread.fullID in quotes
i = 0
while quotelink = quotelinks[i++]
quotelink.textContent = quotelink.textContent.replace QuoteOP.text, ''
@@ -27,7 +27,7 @@ QuoteOP =
{fullID} = (if @isClone then @context else @).thread
# add (OP) to quotes quoting this context's OP.
- return unless quotes.contains fullID
+ return unless fullID in quotes
i = 0
while quotelink = quotelinks[i++]
{boardID, postID} = Get.postDataFromLink quotelink
diff --git a/src/Quotelinks/QuoteThreading.coffee b/src/Quotelinks/QuoteThreading.coffee
index ec28ddfcb..f4d99c024 100755
--- a/src/Quotelinks/QuoteThreading.coffee
+++ b/src/Quotelinks/QuoteThreading.coffee
@@ -11,14 +11,14 @@ QuoteThreading =
innerHTML: ''
input = $ 'input', @controls
- $.on input, 'change', QuoteThreading.toggle
+ $.on input, 'change', @toggle
$.event 'AddMenuEntry',
type: 'header'
el: @controls
order: 98
- $.on d, '4chanXInitFinished', @setup
+ $.on d, '4chanXInitFinished', @setup unless Conf['Unread Count']
Post.callbacks.push
name: 'Quote Threading'
@@ -26,83 +26,87 @@ QuoteThreading =
setup: ->
$.off d, '4chanXInitFinished', QuoteThreading.setup
- {posts} = g
+ QuoteThreading.force()
- for ID, post of posts
- if post.cb
- post.cb.call post
-
- QuoteThreading.hasRun = true
+ force: ->
+ post.cb true for ID, post of g.posts when post.cb
+ return
node: ->
- return if @isClone or not QuoteThreading.enabled or @thread.OP is @
-
- {quotes, ID, fullID} = @
{posts} = g
- return if !(post = posts[fullID]) or post.isHidden # Filtered
+ return if @isClone or not QuoteThreading.enabled
+ Unread.posts.push @ if Conf['Unread Count']
- uniq = {}
- len = "#{g.BOARD}".length + 1
- for quote in quotes
- qid = quote
- continue unless qid[len..] < ID
- if qid of posts
- uniq[qid[len..]] = true
+ return if @thread.OP is @ or !(post = posts[@fullID]) or post.isHidden # Filtered
+
+ keys = []
+ len = g.BOARD.ID.length + 1
+ keys.push quote for quote in @quotes when (quote[len..] < @ID) and quote of posts
- keys = Object.keys uniq
return unless keys.length is 1
- @threaded = "#{g.BOARD}.#{keys[0]}"
+ @threaded = keys[0]
@cb = QuoteThreading.nodeinsert
- nodeinsert: ->
- qpost = g.posts[@threaded]
+ nodeinsert: (force) ->
+ post = g.posts[@threaded]
- delete @threaded
- delete @cb
+ return false if @thread.OP is post
- return false if @thread.OP is qpost
+ {posts} = Unread
+ {root} = post.nodes
- if QuoteThreading.hasRun
+ unless force
height = doc.clientHeight
- {bottom, top} = qpost.nodes.root.getBoundingClientRect()
+ {bottom, top} = root.getBoundingClientRect()
# Post is unread or is fully visible.
- return false unless Unread.posts.contains(qpost) or ((bottom < height) and (top > 0))
+ return false unless (Conf['Unread Count'] and posts[post.ID]) or ((bottom < height) and (top > 0))
- qroot = qpost.nodes.root
- unless $.hasClass qroot, 'threadOP'
- $.addClass qroot, 'threadOP'
+ if $.hasClass root, 'threadOP'
+ threadContainer = root.nextElementSibling
+ post = Get.postFromRoot $.x 'descendant::div[contains(@class,"postContainer")][last()]', threadContainer
+ $.add threadContainer, @nodes.root
+
+ else
threadContainer = $.el 'div',
className: 'threadContainer'
- $.after qroot, threadContainer
- else
- threadContainer = qroot.nextSibling
+ $.add threadContainer, @nodes.root
+ $.after root, threadContainer
+ $.addClass root, 'threadOP'
+
+ return true unless Conf['Unread Count']
+
+ if posts[post.ID]
+ posts.after post, @
+
+ else
+ posts.prepend @
- $.add threadContainer, @nodes.root
return true
toggle: ->
- thread = $ '.thread'
- replies = $$ '.thread > .replyContainer, .threadContainer > .replyContainer', thread
- QuoteThreading.enabled = @checked
- if @checked
- QuoteThreading.hasRun = false
- for reply in replies
- QuoteThreading.node.call node = Get.postFromRoot reply
- node.cb() if node.cb
- QuoteThreading.hasRun = true
+ if QuoteThreading.enabled = @checked
+ QuoteThreading.force()
+
else
- replies.sort (a, b) ->
- aID = Number a.id[2..]
- bID = Number b.id[2..]
- aID - bID
- $.add thread, replies
+ thread = $('.thread')
+ posts = []
+ nodes = []
+
+ posts.push post for ID, post of g.posts when not (post is post.thread.OP or post.isClone)
+ posts.sort (a, b) -> a.ID - b.ID
+
+ nodes.push post.nodes.root for post in posts
+ $.add thread, nodes
+
containers = $$ '.threadContainer', thread
$.rm container for container in containers
$.rmClass post, 'threadOP' for post in $$ '.threadOP'
- Unread.update true
+
+ return
kb: ->
control = $.id 'threadingControl'
- control.click()
\ No newline at end of file
+ control.checked = not control.checked
+ QuoteThreading.toggle.call control
\ No newline at end of file
diff --git a/src/Quotelinks/Quotify.coffee b/src/Quotelinks/Quotify.coffee
index 3fd3fc2bb..6d00037a7 100755
--- a/src/Quotelinks/Quotify.coffee
+++ b/src/Quotelinks/Quotify.coffee
@@ -69,19 +69,16 @@ Quotify =
$.addClass a, 'quotelink'
$.extend a.dataset, {boardID, postID}
- unless @quotes.contains quoteID
- @quotes.push quoteID
+ @quotes.push quoteID unless quoteID in @quotes
- unless a
- deadlink.textContent = "#{quote}\u00A0(Dead)"
- return
+ return deadlink.textContent = "#{quote}\u00A0(Dead)" unless a
$.replace deadlink, a
if $.hasClass a, 'quotelink'
@nodes.quotelinks.push a
fixDeadlink: (deadlink) ->
- if !(el = deadlink.previousSibling) or el.nodeName is 'BR'
+ if not (el = deadlink.previousSibling) or el.nodeName is 'BR'
green = $.el 'span',
className: 'quote'
$.before deadlink, green
![File deleted.](" + staticPath + "filedeleted.gif)
") + "![](" + staticPath + "adminicon.gif)
";
+ capcodeIcon = (" ![](" + staticPath + "modicon.gif)
";
+ capcodeIcon = (" ![](" + staticPath + "developericon.gif)
";
+ capcodeIcon = (" ![+ flagCode +](" + staticPath + "country/troll/" + (flagCode.toLowerCase()) + ".gif "\" + flagName + \"")
" : " ";
if (file != null ? file.isDeleted : void 0) {
- fileHTML = isOP ? ("![File deleted.](" + staticPath + "filedeleted-res.gif)
") + "
"
- when 'mod'
- capcodeClass = " capcodeMod"
- capcodeStart = " ## Mod"
- capcode = " 
"
- when 'developer'
- capcodeClass = " capcodeDeveloper"
- capcodeStart = " ## Developer"
- capcode = " 
"
- else
- capcodeClass = ''
- capcodeStart = ''
- capcode = ''
-
flag = unless flagCode
''
else if boardID is 'pol'
@@ -117,21 +121,15 @@ Build =
if file?.isDeleted
fileHTML = if isOP
- "
" +
+ "
" +
+ "
"
+ " 
"
+ "