Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Close #772.

Browse Source
This commit is contained in:
Nicolas Stepien 2013-02-13 16:57:32 +01:00
parent c2715231a3
commit 859c5db1f0
3 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
4chan_x.user.js
View File

@ -4045,23 +4045,25 @@
} }
}, },
quote: function(e) { quote: function(e) {
var caretPos, post, range, s, sel, selectionRoot, ta, text; var caretPos, post, range, s, sel, selectionRoot, ta, text, thread;
if (e != null) { if (e != null) {
e.preventDefault(); e.preventDefault();
} }
QR.open(); text = "";
ta = $('textarea', QR.el);
if (QR.threadSelector && !ta.value && g.BOARD.ID !== 'f') {
QR.threadSelector.value = $.x('ancestor::div[parent::div[@class="board"]]', this).id.slice(1);
}
post = Get.postFromRoot($.x('ancestor-or-self::div[contains(@class,"postContainer")][1]', this));
text = ">>" + post + "\n";
sel = d.getSelection(); sel = d.getSelection();
selectionRoot = $.x('ancestor-or-self::div[contains(@class,"postContainer")][1]', sel.anchorNode); selectionRoot = $.x('ancestor::div[contains(@class,"postContainer")][1]', sel.anchorNode);
post = Get.postFromRoot($.x('ancestor::div[contains(@class,"postContainer")][1]', this));
thread = g.BOARD.posts[Get.contextFromLink(this).thread];
if ((s = sel.toString().trim()) && post.nodes.root === selectionRoot) { if ((s = sel.toString().trim()) && post.nodes.root === selectionRoot) {
s = s.replace(/\n/g, '\n>'); s = s.replace(/\n/g, '\n>');
text += ">" + s + "\n"; text += ">" + s + "\n";
} }
text = !text && post === thread && (!QR.el || QR.el.hidden) ? "" : ">>" + post + "\n" + text;
QR.open();
ta = $('textarea', QR.el);
if (QR.threadSelector && !ta.value && g.BOARD.ID !== 'f') {
QR.threadSelector.value = thread.ID;
}
caretPos = ta.selectionStart; caretPos = ta.selectionStart;
ta.value = ta.value.slice(0, caretPos) + text + ta.value.slice(ta.selectionEnd); ta.value = ta.value.slice(0, caretPos) + text + ta.value.slice(ta.selectionEnd);
range = caretPos + text.length; range = caretPos + text.length;

1
changelog
View File

@ -10,6 +10,7 @@ alpha
QR changes: QR changes:
Creating threads outside of the index is now possible. Creating threads outside of the index is now possible.
Selection-to-quote also applies to selected text inside the post, not just inside the comment. Selection-to-quote also applies to selected text inside the post, not just inside the comment.
Quoting the OP will not insert the >>opnumber anymore unless the QR was already opened.
Added touch and multi-touch support for dragging windows. Added touch and multi-touch support for dragging windows.
The Thread Updater will pause when offline, and resume when online. The Thread Updater will pause when offline, and resume when online.
Added Thread & Post Hiding in the Menu, with individual settings. Added Thread & Post Hiding in the Menu, with individual settings.

25
src/qr.coffee
View File

@ -219,21 +219,30 @@ QR =
quote: (e) -> quote: (e) ->
e?.preventDefault() e?.preventDefault()
QR.open() text = ""
ta = $ 'textarea', QR.el
if QR.threadSelector and !ta.value and g.BOARD.ID isnt 'f'
QR.threadSelector.value = $.x('ancestor::div[parent::div[@class="board"]]', @).id[1..]
# Make sure we get the correct number, even with XXX censors
post = Get.postFromRoot $.x 'ancestor-or-self::div[contains(@class,"postContainer")][1]', @
text = ">>#{post}\n"
sel = d.getSelection() sel = d.getSelection()
selectionRoot = $.x 'ancestor-or-self::div[contains(@class,"postContainer")][1]', sel.anchorNode selectionRoot = $.x 'ancestor::div[contains(@class,"postContainer")][1]', sel.anchorNode
post = Get.postFromRoot $.x 'ancestor::div[contains(@class,"postContainer")][1]', @
thread = g.BOARD.posts[Get.contextFromLink(@).thread]
if (s = sel.toString().trim()) and post.nodes.root is selectionRoot if (s = sel.toString().trim()) and post.nodes.root is selectionRoot
# XXX Opera doesn't retain `\n`s? # XXX Opera doesn't retain `\n`s?
s = s.replace /\n/g, '\n>' s = s.replace /\n/g, '\n>'
text += ">#{s}\n" text += ">#{s}\n"
text = if !text and post is thread and (!QR.el or QR.el.hidden)
# Don't quote the OP unless the QR was already opened once.
""
else
">>#{post}\n#{text}"
QR.open()
ta = $ 'textarea', QR.el
if QR.threadSelector and !ta.value and g.BOARD.ID isnt 'f'
QR.threadSelector.value = thread.ID
# Make sure we get the correct number, even with XXX censors
caretPos = ta.selectionStart caretPos = ta.selectionStart
# Replace selection for text. # Replace selection for text.
ta.value = ta.value[...caretPos] + text + ta.value[ta.selectionEnd..] ta.value = ta.value[...caretPos] + text + ta.value[ta.selectionEnd..]