Reimplement QuoteThreading.disconnect()

This commit is contained in:
Zixaphir 2015-01-11 20:29:41 -07:00
parent ef16eb9601
commit 081a5eac28
5 changed files with 45 additions and 27 deletions

View File

@ -6030,14 +6030,14 @@
postID: data.no, postID: data.no,
threadID: data.resto || data.no, threadID: data.resto || data.no,
boardID: boardID, boardID: boardID,
name: Build.unescape(data.name), name: data.name,
capcode: data.capcode, capcode: data.capcode,
tripcode: data.trip, tripcode: data.trip,
uniqueID: data.id, uniqueID: data.id,
email: Build.unescape(data.email), email: data.email,
subject: Build.unescape(data.sub), subject: data.sub,
flagCode: data.country, flagCode: data.country,
flagName: Build.unescape(data.country_name), flagName: data.country_name,
date: data.now, date: data.now,
dateUTC: data.time, dateUTC: data.time,
comment: { comment: {
@ -6053,7 +6053,7 @@
}; };
} else if (data.ext) { } else if (data.ext) {
o.file = { o.file = {
name: (Build.unescape(data.filename)) + data.ext, name: data.filename + data.ext,
timestamp: "" + data.tim + data.ext, timestamp: "" + data.tim + data.ext,
url: boardID === 'f' ? "//i.4cdn.org/" + boardID + "/" + (encodeURIComponent(data.filename)) + data.ext : "//i.4cdn.org/" + boardID + "/" + data.tim + data.ext, url: boardID === 'f' ? "//i.4cdn.org/" + boardID + "/" + (encodeURIComponent(data.filename)) + data.ext : "//i.4cdn.org/" + boardID + "/" + data.tim + data.ext,
height: data.h, height: data.h,

View File

@ -6059,14 +6059,14 @@
postID: data.no, postID: data.no,
threadID: data.resto || data.no, threadID: data.resto || data.no,
boardID: boardID, boardID: boardID,
name: Build.unescape(data.name), name: data.name,
capcode: data.capcode, capcode: data.capcode,
tripcode: data.trip, tripcode: data.trip,
uniqueID: data.id, uniqueID: data.id,
email: Build.unescape(data.email), email: data.email,
subject: Build.unescape(data.sub), subject: data.sub,
flagCode: data.country, flagCode: data.country,
flagName: Build.unescape(data.country_name), flagName: data.country_name,
date: data.now, date: data.now,
dateUTC: data.time, dateUTC: data.time,
comment: { comment: {
@ -6082,7 +6082,7 @@
}; };
} else if (data.ext) { } else if (data.ext) {
o.file = { o.file = {
name: (Build.unescape(data.filename)) + data.ext, name: data.filename + data.ext,
timestamp: "" + data.tim + data.ext, timestamp: "" + data.tim + data.ext,
url: boardID === 'f' ? "//i.4cdn.org/" + boardID + "/" + (encodeURIComponent(data.filename)) + data.ext : "//i.4cdn.org/" + boardID + "/" + data.tim + data.ext, url: boardID === 'f' ? "//i.4cdn.org/" + boardID + "/" + (encodeURIComponent(data.filename)) + data.ext : "//i.4cdn.org/" + boardID + "/" + data.tim + data.ext,
height: data.h, height: data.h,

View File

@ -33,24 +33,24 @@ Build =
postFromObject: (data, boardID) -> postFromObject: (data, boardID) ->
o = o =
# id # id
postID: data.no postID: data.no
threadID: data.resto or data.no threadID: data.resto or data.no
boardID: boardID boardID: boardID
# info # info
name: Build.unescape data.name name: data.name
capcode: data.capcode capcode: data.capcode
tripcode: data.trip tripcode: data.trip
uniqueID: data.id uniqueID: data.id
email: Build.unescape data.email email: data.email
subject: Build.unescape data.sub subject: data.sub
flagCode: data.country flagCode: data.country
flagName: Build.unescape data.country_name flagName: data.country_name
date: data.now date: data.now
dateUTC: data.time dateUTC: data.time
comment: {innerHTML: data.com or ''} comment: {innerHTML: data.com or ''}
# thread status # thread status
isSticky: !!data.sticky isSticky: !!data.sticky
isClosed: !!data.closed isClosed: !!data.closed
isArchived: !!data.archived isArchived: !!data.archived
# file # file
if data.filedeleted if data.filedeleted
@ -58,7 +58,7 @@ Build =
isDeleted: true isDeleted: true
else if data.ext else if data.ext
o.file = o.file =
name: (Build.unescape data.filename) + data.ext name: data.filename + data.ext
timestamp: "#{data.tim}#{data.ext}" timestamp: "#{data.tim}#{data.ext}"
url: if boardID is 'f' url: if boardID is 'f'
"//i.4cdn.org/#{boardID}/#{encodeURIComponent data.filename}#{data.ext}" "//i.4cdn.org/#{boardID}/#{encodeURIComponent data.filename}#{data.ext}"

View File

@ -163,6 +163,7 @@ UI = do ->
onFocus: (e) => onFocus: (e) =>
e.stopPropagation() e.stopPropagation()
@focus e.target @focus e.target
focus: (entry) -> focus: (entry) ->
while focused = $.x 'parent::*/child::*[contains(@class,"focused")]', entry while focused = $.x 'parent::*/child::*[contains(@class,"focused")]', entry
$.rmClass focused, 'focused' $.rmClass focused, 'focused'

View File

@ -27,6 +27,7 @@ QuoteThreading =
Thread.callbacks.push Thread.callbacks.push
name: 'Quote Threading' name: 'Quote Threading'
cb: @setThread cb: @setThread
Post.callbacks.push Post.callbacks.push
name: 'Quote Threading' name: 'Quote Threading'
cb: @node cb: @node
@ -35,6 +36,22 @@ QuoteThreading =
children: {} children: {}
inserted: {} inserted: {}
disconnect: ->
return unless Conf['Quote Threading'] and g.VIEW is 'thread'
Header.menu.rmEntry @entry
delete @enabled
delete @controls
delete @entry
@parent = {}
@children = {}
@inserted = {}
Thread.callbacks.disconnect 'Quote Threading'
Post.callbacks.disconnect 'Quote Threading'
setThread: -> setThread: ->
QuoteThreading.thread = @ QuoteThreading.thread = @
$.asap (-> !Conf['Thread Updater'] or $ '.navLinksBot > .updatelink'), -> $.asap (-> !Conf['Thread Updater'] or $ '.navLinksBot > .updatelink'), ->