diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js index f12b3fcd8..c131daff7 100644 --- a/builds/appchan-x.user.js +++ b/builds/appchan-x.user.js @@ -405,7 +405,7 @@ }, boardnav: "[ toggle-all ]\n[current-title]\n[external-text:\"FAQ\",\"https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions\"]", QR: { - 'QR.personas': "#email:\"sage\";boards:jp;always" + 'QR.personas': "#options:\"sage\";boards:jp;always" }, time: '%m/%d/%y(%a)%H:%M:%S', backlink: '>>%id', @@ -9107,7 +9107,7 @@ dialog: function() { var dialog, elm, event, i, items, name, node, nodes, prop, rules, save, setNode, _, _i, _len, _ref, _ref1, _ref2; QR.nodes = nodes = { - el: dialog = UI.dialog('qr', 'top:0;right:0;', "
\uf00d
+
No selected fileSpoiler\uf0c1Post from URL+Dump\uf00dRemove File
") + el: dialog = UI.dialog('qr', 'top:0;right:0;', "
\uf00d
+
No selected fileSpoiler\uf0c1Post from URL+Dump\uf00dRemove File
") }; setNode = function(name, query) { return nodes[name] = $(query, dialog); @@ -9154,7 +9154,7 @@ QR.max_size_video = 3145728; QR.max_width_video = QR.max_height_video = 2048; QR.max_duration_video = 120; - QR.spoiler = !!$('input[name=spoiler]'); + QR.spoiler = !!$('.postForm input[name=spoiler]'); if (QR.spoiler) { $.addClass(QR.nodes.el, 'has-spoiler'); } else { @@ -9911,7 +9911,7 @@ if (item[0] === '#') { return; } - if (!(match = item.match(/(name|email|subject|password):"(.*)"/i))) { + if (!(match = item.match(/(name|options|email|subject|password):"(.*)"/i))) { return; } _ref = match, match = _ref[0], type = _ref[1], val = _ref[2]; @@ -9924,6 +9924,9 @@ QR.persona.pwd = val; return; } + if (type === 'options') { + type = 'email'; + } if (type === 'subject') { type = 'sub'; } @@ -17246,7 +17249,7 @@ }, advanced: function(section) { var archBoards, boardID, boardOptions, boardSelect, boards, event, files, i, input, inputs, item, items, name, o, row, rows, software, ta, table, withCredentials, _i, _j, _k, _l, _len, _len1, _len2, _len3, _len4, _len5, _m, _n, _ref, _ref1, _ref2, _ref3, _ref4, _ref5; - section.innerHTML = "
Archiver
404 Redirect is disabled.
Thread redirectionPost fetchingFile redirection
Disabled selections indicate that only one archive is available for that board and redirection type.
Custom Board Navigation
New lines will be converted into spaces.

In the following examples for /g/, g can be changed to a different board ID (a, b, etc...), the current board (current), or the Twitter link (@).
Board link: g
Title link: g-title
Board link (Replace with title when on that board): g-replace
Full text link: g-full
Custom text link: g-text:\"Install Gentoo\"
External link: external-text:\"Google\",\"http://www.google.com\"
Index mode: g-mode:\"type\" where type is paged, all threads or catalog
Index sort: g-sort:\"type\" where type is bump order, last reply, creation date, reply count or file countCombinations are possible: g-text:\"VIP Catalog\"-mode:\"catalog\"-sort:\"creation date\"
Full board list toggle: toggle-all

[ toggle-all ] [current-title] [g-title / a-title / jp-title] [x / wsg / h-mode:\"catalog\"-sort:\"file count\"] [t-text:\"Piracy\"]
will give you
[ + ] [Technology] [Technology / Anime & Manga / Otaku Culture] [x / wsg / h] [Piracy]
if you are on /g/.
Time Formatting is disabled.
:
Supported format specifiers:
Day: %a, %A, %d, %e
Month: %m, %b, %B
Year: %y, %Y
Hour: %k, %H, %l, %I, %p, %P
Minute: %M
Second: %S
Quote Backlinks formatting is disabled.
:
File Info Formatting is disabled.
:
Link: %l (truncated), %L (untruncated), %T (Unix timestamp)
Original file name: %n (truncated), %N (untruncated), %t (Unix timestamp)
Spoiler indicator: %p
Size: %B (Bytes), %K (KB), %M (MB), %s (4chan default)
Resolution: %r (Displays 'PDF' for PDF files)
Quick Reply Personas

One item per line.
Items will be added in the relevant input's auto-completion list.
Password items will always be used, since there is no password input.
Lines starting with a # will be ignored.

Unread Favicon is disabled.
Emoji is disabled.
Sage Icon:
Thread Updater is disabled.
Interval:
Custom CSS
"; + section.innerHTML = "
Archiver
404 Redirect is disabled.
Thread redirectionPost fetchingFile redirection
Disabled selections indicate that only one archive is available for that board and redirection type.
Custom Board Navigation
New lines will be converted into spaces.

In the following examples for /g/, g can be changed to a different board ID (a, b, etc...), the current board (current), or the Twitter link (@).
Board link: g
Title link: g-title
Board link (Replace with title when on that board): g-replace
Full text link: g-full
Custom text link: g-text:\"Install Gentoo\"
External link: external-text:\"Google\",\"http://www.google.com\"
Index mode: g-mode:\"type\" where type is paged, all threads or catalog
Index sort: g-sort:\"type\" where type is bump order, last reply, creation date, reply count or file countCombinations are possible: g-text:\"VIP Catalog\"-mode:\"catalog\"-sort:\"creation date\"
Full board list toggle: toggle-all

[ toggle-all ] [current-title] [g-title / a-title / jp-title] [x / wsg / h-mode:\"catalog\"-sort:\"file count\"] [t-text:\"Piracy\"]
will give you
[ + ] [Technology] [Technology / Anime & Manga / Otaku Culture] [x / wsg / h] [Piracy]
if you are on /g/.
Time Formatting is disabled.
:
Supported format specifiers:
Day: %a, %A, %d, %e
Month: %m, %b, %B
Year: %y, %Y
Hour: %k, %H, %l, %I, %p, %P
Minute: %M
Second: %S
Quote Backlinks formatting is disabled.
:
File Info Formatting is disabled.
:
Link: %l (truncated), %L (untruncated), %T (Unix timestamp)
Original file name: %n (truncated), %N (untruncated), %t (Unix timestamp)
Spoiler indicator: %p
Size: %B (Bytes), %K (KB), %M (MB), %s (4chan default)
Resolution: %r (Displays 'PDF' for PDF files)
Quick Reply Personas

One item per line.
Items will be added in the relevant input's auto-completion list.
Password items will always be used, since there is no password input.
Lines starting with a # will be ignored.

Unread Favicon is disabled.
Emoji is disabled.
Sage Icon:
Thread Updater is disabled.
Interval:
Custom CSS
"; items = {}; inputs = {}; _ref = ['boardnav', 'time', 'backlink', 'fileInfo', 'favicon', 'usercss']; diff --git a/builds/crx/script.js b/builds/crx/script.js index 9cbe37f95..f08898e6c 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -376,7 +376,7 @@ }, boardnav: "[ toggle-all ]\n[current-title]\n[external-text:\"FAQ\",\"https://github.com/ccd0/4chan-x/wiki/Frequently-Asked-Questions\"]", QR: { - 'QR.personas': "#email:\"sage\";boards:jp;always" + 'QR.personas': "#options:\"sage\";boards:jp;always" }, time: '%m/%d/%y(%a)%H:%M:%S', backlink: '>>%id', @@ -9155,7 +9155,7 @@ dialog: function() { var dialog, elm, event, i, items, name, node, nodes, prop, rules, save, setNode, _, _i, _len, _ref, _ref1, _ref2; QR.nodes = nodes = { - el: dialog = UI.dialog('qr', 'top:0;right:0;', "
\uf00d
No selected fileSpoiler\uf0c1Post from URL+Dump\uf00dRemove File
") + el: dialog = UI.dialog('qr', 'top:0;right:0;', "
\uf00d
No selected fileSpoiler\uf0c1Post from URL+Dump\uf00dRemove File
") }; setNode = function(name, query) { return nodes[name] = $(query, dialog); @@ -9202,7 +9202,7 @@ QR.max_size_video = 3145728; QR.max_width_video = QR.max_height_video = 2048; QR.max_duration_video = 120; - QR.spoiler = !!$('input[name=spoiler]'); + QR.spoiler = !!$('.postForm input[name=spoiler]'); if (QR.spoiler) { $.addClass(QR.nodes.el, 'has-spoiler'); } else { @@ -9948,7 +9948,7 @@ if (item[0] === '#') { return; } - if (!(match = item.match(/(name|email|subject|password):"(.*)"/i))) { + if (!(match = item.match(/(name|options|email|subject|password):"(.*)"/i))) { return; } _ref = match, match = _ref[0], type = _ref[1], val = _ref[2]; @@ -9961,6 +9961,9 @@ QR.persona.pwd = val; return; } + if (type === 'options') { + type = 'email'; + } if (type === 'subject') { type = 'sub'; } @@ -17260,7 +17263,7 @@ }, advanced: function(section) { var archBoards, boardID, boardOptions, boardSelect, boards, event, files, i, input, inputs, item, items, name, o, row, rows, software, ta, table, withCredentials, _i, _j, _k, _l, _len, _len1, _len2, _len3, _len4, _len5, _m, _n, _ref, _ref1, _ref2, _ref3, _ref4, _ref5; - section.innerHTML = "
Archiver
404 Redirect is disabled.
Thread redirectionPost fetchingFile redirection
Disabled selections indicate that only one archive is available for that board and redirection type.
Custom Board Navigation
New lines will be converted into spaces.

In the following examples for /g/, g can be changed to a different board ID (a, b, etc...), the current board (current), or the Twitter link (@).
Board link: g
Title link: g-title
Board link (Replace with title when on that board): g-replace
Full text link: g-full
Custom text link: g-text:\"Install Gentoo\"
External link: external-text:\"Google\",\"http://www.google.com\"
Index mode: g-mode:\"type\" where type is paged, all threads or catalog
Index sort: g-sort:\"type\" where type is bump order, last reply, creation date, reply count or file countCombinations are possible: g-text:\"VIP Catalog\"-mode:\"catalog\"-sort:\"creation date\"
Full board list toggle: toggle-all

[ toggle-all ] [current-title] [g-title / a-title / jp-title] [x / wsg / h-mode:\"catalog\"-sort:\"file count\"] [t-text:\"Piracy\"]
will give you
[ + ] [Technology] [Technology / Anime & Manga / Otaku Culture] [x / wsg / h] [Piracy]
if you are on /g/.
Time Formatting is disabled.
:
Supported format specifiers:
Day: %a, %A, %d, %e
Month: %m, %b, %B
Year: %y, %Y
Hour: %k, %H, %l, %I, %p, %P
Minute: %M
Second: %S
Quote Backlinks formatting is disabled.
:
File Info Formatting is disabled.
:
Link: %l (truncated), %L (untruncated), %T (Unix timestamp)
Original file name: %n (truncated), %N (untruncated), %t (Unix timestamp)
Spoiler indicator: %p
Size: %B (Bytes), %K (KB), %M (MB), %s (4chan default)
Resolution: %r (Displays 'PDF' for PDF files)
Quick Reply Personas

One item per line.
Items will be added in the relevant input's auto-completion list.
Password items will always be used, since there is no password input.
Lines starting with a # will be ignored.

    You can use these settings with each item, separate them with semicolons:
  • Possible items are: name, email, subject and password.
  • Wrap values of items with quotes, like this: email:\"sage\".
  • Force values as defaults with the always keyword, for example: email:\"sage\";always.
  • Select specific boards for an item, separated with commas, for example: email:\"sage\";boards:jp;always.
Unread Favicon is disabled.
Emoji is disabled.
Sage Icon:
Thread Updater is disabled.
Interval:
Custom CSS
"; + section.innerHTML = "
Archiver
404 Redirect is disabled.
Thread redirectionPost fetchingFile redirection
Disabled selections indicate that only one archive is available for that board and redirection type.
Custom Board Navigation
New lines will be converted into spaces.

In the following examples for /g/, g can be changed to a different board ID (a, b, etc...), the current board (current), or the Twitter link (@).
Board link: g
Title link: g-title
Board link (Replace with title when on that board): g-replace
Full text link: g-full
Custom text link: g-text:\"Install Gentoo\"
External link: external-text:\"Google\",\"http://www.google.com\"
Index mode: g-mode:\"type\" where type is paged, all threads or catalog
Index sort: g-sort:\"type\" where type is bump order, last reply, creation date, reply count or file countCombinations are possible: g-text:\"VIP Catalog\"-mode:\"catalog\"-sort:\"creation date\"
Full board list toggle: toggle-all

[ toggle-all ] [current-title] [g-title / a-title / jp-title] [x / wsg / h-mode:\"catalog\"-sort:\"file count\"] [t-text:\"Piracy\"]
will give you
[ + ] [Technology] [Technology / Anime & Manga / Otaku Culture] [x / wsg / h] [Piracy]
if you are on /g/.
Time Formatting is disabled.
:
Supported format specifiers:
Day: %a, %A, %d, %e
Month: %m, %b, %B
Year: %y, %Y
Hour: %k, %H, %l, %I, %p, %P
Minute: %M
Second: %S
Quote Backlinks formatting is disabled.
:
File Info Formatting is disabled.
:
Link: %l (truncated), %L (untruncated), %T (Unix timestamp)
Original file name: %n (truncated), %N (untruncated), %t (Unix timestamp)
Spoiler indicator: %p
Size: %B (Bytes), %K (KB), %M (MB), %s (4chan default)
Resolution: %r (Displays 'PDF' for PDF files)
Quick Reply Personas

One item per line.
Items will be added in the relevant input's auto-completion list.
Password items will always be used, since there is no password input.
Lines starting with a # will be ignored.

    You can use these settings with each item, separate them with semicolons:
  • Possible items are: name, options (or equivalently email), subject and password.
  • Wrap values of items with quotes, like this: options:\"sage\".
  • Force values as defaults with the always keyword, for example: options:\"sage\";always.
  • Select specific boards for an item, separated with commas, for example: options:\"sage\";boards:jp;always.
Unread Favicon is disabled.
Emoji is disabled.
Sage Icon:
Thread Updater is disabled.
Interval:
Custom CSS
"; items = {}; inputs = {}; _ref = ['boardnav', 'time', 'backlink', 'fileInfo', 'favicon', 'usercss']; diff --git a/src/General/Config.coffee b/src/General/Config.coffee index ff7685542..a065c2b46 100644 --- a/src/General/Config.coffee +++ b/src/General/Config.coffee @@ -906,7 +906,7 @@ Config = QR: 'QR.personas': """ - #email:"sage";boards:jp;always + #options:"sage";boards:jp;always """ time: '%m/%d/%y(%a)%H:%M:%S' diff --git a/src/General/html/Features/QuickReply.html b/src/General/html/Features/QuickReply.html index a885db216..749cdef03 100755 --- a/src/General/html/Features/QuickReply.html +++ b/src/General/html/Features/QuickReply.html @@ -10,7 +10,7 @@
- +
diff --git a/src/General/html/Settings/Advanced.html b/src/General/html/Settings/Advanced.html index feb42a7a5..4c72925e4 100755 --- a/src/General/html/Settings/Advanced.html +++ b/src/General/html/Settings/Advanced.html @@ -74,10 +74,10 @@ Lines starting with a # will be ignored.

    You can use these settings with each item, separate them with semicolons: -
  • Possible items are: name, email, subject and password.
    • -
  • Wrap values of items with quotes, like this: email:"sage".
    • -
  • Force values as defaults with the always keyword, for example: email:"sage";always.
    • -
  • Select specific boards for an item, separated with commas, for example: email:"sage";boards:jp;always.
    • +
  • Possible items are: name, options (or equivalently email), subject and password.
    • +
  • Wrap values of items with quotes, like this: options:"sage".
    • +
  • Force values as defaults with the always keyword, for example: options:"sage";always.
    • +
  • Select specific boards for an item, separated with commas, for example: options:"sage";boards:jp;always.
@@ -117,4 +117,4 @@ -
\ No newline at end of file +
diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee index 6440c6608..862967159 100644 --- a/src/Posting/QR.coffee +++ b/src/Posting/QR.coffee @@ -461,7 +461,7 @@ QR = QR.max_width_video = QR.max_height_video = 2048 QR.max_duration_video = 120 - QR.spoiler = !!$ 'input[name=spoiler]' + QR.spoiler = !!$ '.postForm input[name=spoiler]' if QR.spoiler $.addClass QR.nodes.el, 'has-spoiler' else diff --git a/src/Posting/QR.persona.coffee b/src/Posting/QR.persona.coffee index 35238d27d..670595f93 100644 --- a/src/Posting/QR.persona.coffee +++ b/src/Posting/QR.persona.coffee @@ -16,7 +16,7 @@ QR.persona = parseItem: (item, types) -> return if item[0] is '#' - return unless match = item.match /(name|email|subject|password):"(.*)"/i + return unless match = item.match /(name|options|email|subject|password):"(.*)"/i [match, type, val] = match # Don't mix up item settings with val. @@ -30,7 +30,8 @@ QR.persona = QR.persona.pwd = val return - type = 'sub' if type is 'subject' + type = 'email' if type is 'options' + type = 'sub' if type is 'subject' if /always/i.test item QR.persona.always[type] = val