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

When quoting on the index, only change the target thread if the textarea is empty. Close #879

Browse Source
This commit is contained in:
Nicolas Stepien 2013-01-03 15:34:15 +01:00
parent 0477eb595c
commit c720b90a86
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
4chan_x.user.js
View File

@ -1993,7 +1993,8 @@
e.preventDefault(); e.preventDefault();
} }
QR.open(); QR.open();
if (!g.REPLY) { ta = $('textarea', QR.el);
if (!(g.REPLY || ta.value)) {
QR.threadSelector.value = $.x('ancestor::div[parent::div[@class="board"]]', this).id.slice(1); QR.threadSelector.value = $.x('ancestor::div[parent::div[@class="board"]]', this).id.slice(1);
} }
id = this.previousSibling.hash.slice(2); id = this.previousSibling.hash.slice(2);
@ -2003,7 +2004,6 @@
s = s.replace(/\n/g, '\n>'); s = s.replace(/\n/g, '\n>');
text += ">" + s + "\n"; text += ">" + s + "\n";
} }
ta = $('textarea', QR.el);
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;

4
script.coffee
View File

@ -1550,7 +1550,8 @@ QR =
quote: (e) -> quote: (e) ->
e?.preventDefault() e?.preventDefault()
QR.open() QR.open()
unless g.REPLY ta = $ 'textarea', QR.el
unless g.REPLY or ta.value
QR.threadSelector.value = $.x('ancestor::div[parent::div[@class="board"]]', @).id[1..] QR.threadSelector.value = $.x('ancestor::div[parent::div[@class="board"]]', @).id[1..]
# Make sure we get the correct number, even with XXX censors # Make sure we get the correct number, even with XXX censors
id = @previousSibling.hash[2..] id = @previousSibling.hash[2..]
@ -1562,7 +1563,6 @@ QR =
s = s.replace /\n/g, '\n>' s = s.replace /\n/g, '\n>'
text += ">#{s}\n" text += ">#{s}\n"
ta = $ 'textarea', QR.el
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..]