Fix QR persona and quoting. #968
This commit is contained in:
parent
1cad4b8d17
commit
3d72a2331c
@ -377,12 +377,12 @@ QR =
|
|||||||
for event in ['dragStart', 'dragEnter', 'dragLeave', 'dragOver', 'dragEnd', 'drop']
|
for event in ['dragStart', 'dragEnter', 'dragLeave', 'dragOver', 'dragEnd', 'drop']
|
||||||
$.on el, event.toLowerCase(), @[event]
|
$.on el, event.toLowerCase(), @[event]
|
||||||
|
|
||||||
|
prev = QR.posts[QR.posts.length - 1]
|
||||||
QR.posts.push @
|
QR.posts.push @
|
||||||
@spoiler = if prev and Conf['Remember Spoiler']
|
@spoiler = if prev and Conf['Remember Spoiler']
|
||||||
prev.spoiler
|
prev.spoiler
|
||||||
else
|
else
|
||||||
false
|
false
|
||||||
prev = QR.posts[QR.posts.length - 1]
|
|
||||||
$.get 'QR.persona', {}, (item) =>
|
$.get 'QR.persona', {}, (item) =>
|
||||||
persona = item['QR.persona']
|
persona = item['QR.persona']
|
||||||
@name = if prev
|
@name = if prev
|
||||||
@ -395,7 +395,8 @@ QR =
|
|||||||
persona.email
|
persona.email
|
||||||
if Conf['Remember Subject']
|
if Conf['Remember Subject']
|
||||||
@sub = if prev then prev.sub else persona.sub
|
@sub = if prev then prev.sub else persona.sub
|
||||||
@select() if select # load persona
|
@load() if QR.selected is @ # load persona
|
||||||
|
@select() if select
|
||||||
@unlock()
|
@unlock()
|
||||||
rm: ->
|
rm: ->
|
||||||
$.rm @nodes.el
|
$.rm @nodes.el
|
||||||
@ -430,6 +431,8 @@ QR =
|
|||||||
rectEl = @nodes.el.getBoundingClientRect()
|
rectEl = @nodes.el.getBoundingClientRect()
|
||||||
rectList = @nodes.el.parentNode.getBoundingClientRect()
|
rectList = @nodes.el.parentNode.getBoundingClientRect()
|
||||||
@nodes.el.parentNode.scrollLeft += rectEl.left + rectEl.width/2 - rectList.left - rectList.width/2
|
@nodes.el.parentNode.scrollLeft += rectEl.left + rectEl.width/2 - rectList.left - rectList.width/2
|
||||||
|
@load()
|
||||||
|
load: ->
|
||||||
# Load this post's values.
|
# Load this post's values.
|
||||||
for name in ['name', 'email', 'sub', 'com']
|
for name in ['name', 'email', 'sub', 'com']
|
||||||
QR.nodes[name].value = @[name] or null
|
QR.nodes[name].value = @[name] or null
|
||||||
@ -993,7 +996,10 @@ QR =
|
|||||||
# Enable auto-posting if we have stuff to post, disable it otherwise.
|
# Enable auto-posting if we have stuff to post, disable it otherwise.
|
||||||
QR.cooldown.auto = QR.posts.length > 1 and isReply
|
QR.cooldown.auto = QR.posts.length > 1 and isReply
|
||||||
|
|
||||||
post.rm()
|
unless Conf['Persistent QR'] or QR.cooldown.auto
|
||||||
|
QR.close()
|
||||||
|
else
|
||||||
|
post.rm()
|
||||||
|
|
||||||
QR.cooldown.set {req, post, isReply}
|
QR.cooldown.set {req, post, isReply}
|
||||||
|
|
||||||
@ -1007,9 +1013,6 @@ QR =
|
|||||||
else
|
else
|
||||||
window.location = "/#{g.BOARD}/res/#{threadID}"
|
window.location = "/#{g.BOARD}/res/#{threadID}"
|
||||||
|
|
||||||
unless Conf['Persistent QR'] or QR.cooldown.auto
|
|
||||||
QR.close()
|
|
||||||
|
|
||||||
QR.status()
|
QR.status()
|
||||||
|
|
||||||
abort: ->
|
abort: ->
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user