diff --git a/builds/4chan-X.js b/builds/4chan-X.js index 76869506c..ff1e67619 100644 --- a/builds/4chan-X.js +++ b/builds/4chan-X.js @@ -52,7 +52,7 @@ Config = { main: { 'Miscellaneous': { - 'Catalog Links': [true, 'Turn Navigation links into links to each board\'s catalog.'], + 'Catalog Links': [true, 'Add toggle link in header menu to turn Navigation links into links to each board\'s catalog.'], 'External Catalog': [false, 'Link to external catalog instead of the internal one.'], 'Custom Board Navigation': [true, 'Show custom links instead of the full board list.'], 'QR Shortcut': [false, 'Adds a small [QR] link in the header.'], @@ -78,8 +78,8 @@ 'Anonymize': [false, 'Make everyone Anonymous.'], 'Filter': [true, 'Self-moderation placebo.'], 'Recursive Hiding': [true, 'Hide replies of hidden posts, recursively.'], - 'Thread Hiding': [true, 'Add buttons to hide entire threads.'], - 'Reply Hiding': [true, 'Add buttons to hide single replies.'], + 'Thread Hiding Buttons': [true, 'Add buttons to hide entire threads.'], + 'Reply Hiding Buttons': [true, 'Add buttons to hide single replies.'], 'Stubs': [true, 'Show stubs of hidden threads / replies.'] }, 'Images': { @@ -104,7 +104,7 @@ 'Thread Updater': [true, 'Fetch and insert new replies. Has more options in its own dialog.'], 'Unread Count': [true, 'Show the unread posts count in the tab title.'], 'Hide Unread Count at (0)': [false, 'Hide the unread posts count when it reaches 0.'], - 'Unread Tab Icon': [true, 'Show a different favicon when there are unread posts.'], + 'Unread Favicon': [true, 'Show a different favicon when there are unread posts.'], 'Unread Line': [true, 'Show a line to distinguish read posts from unread ones.'], 'Scroll to Last Read Post': [true, 'Scroll back to the last read post when reopening a thread.'], 'Thread Excerpt': [true, 'Show an excerpt of the thread in the tab title.'], @@ -159,20 +159,20 @@ }, sauces: "https://www.google.com/searchbyimage?image_url=%TURL\nhttp://iqdb.org/?url=%TURL\n#//tineye.com/search?url=%TURL\n#http://saucenao.com/search.php?url=%TURL\n#http://3d.iqdb.org/?url=%TURL\n#http://regex.info/exif.cgi?imgurl=%URL\n# uploaders:\n#http://imgur.com/upload?url=%URL;text:Upload to imgur\n#http://ompldr.org/upload?url1=%URL;text:Upload to ompldr\n# \"View Same\" in archives:\n#//archive.foolz.us/_/search/image/%MD5/;text:View same on foolz\n#//archive.foolz.us/%board/search/image/%MD5/;text:View same on foolz /%board/\n#//archive.installgentoo.net/%board/image/%MD5;text:View same on installgentoo /%board/", 'Custom CSS': false, - 'Boards Navigation': 'sticky top', + 'Boards Navigation': 'Sticky top', 'Header auto-hide': false, 'Footer auto-hide': true, 'Header catalog links': false, boardnav: '[ toggle-all ] [current-title]', time: '%m/%d/%y(%a)%H:%M:%S', backlink: '>>%id', - fileInfo: '%l (%p%s, %r)', + fileInfo: '%L (%p%s, %r)', favicon: 'ferongr', usercss: '', hotkeys: { 'Toggle board list': ['Ctrl+b', 'Toggle the full board list.'], - 'Open empty QR': ['q', 'Open QR without post number inserted.'], - 'Open QR': ['Shift+q', 'Open QR with post number inserted.'], + 'Open empty QR': ['l', 'Open QR without post number inserted.'], + 'Open QR': ['Shift+l', 'Open QR with post number inserted.'], 'Open settings': ['Alt+o', 'Open Settings.'], 'Close': ['Esc', 'Close Settings, Notifications or QR.'], 'Spoiler tags': ['Ctrl+s', 'Insert spoiler tags.'], @@ -2526,7 +2526,7 @@ PostHiding = { init: function() { - if (g.VIEW === 'catalog' || !Conf['Reply Hiding'] && !Conf['Reply Hiding Link']) { + if (g.VIEW === 'catalog' || !Conf['Reply Hiding Buttons'] && !Conf['Reply Hiding Link']) { return; } this.db = new DataBoard('hiddenPosts'); @@ -2553,7 +2553,7 @@ Recursive.add(PostHiding.hide, this, data.makeStub, true); } } - if (!Conf['Reply Hiding']) { + if (!Conf['Reply Hiding Buttons']) { return; } return $.replace($('.sideArrows', this.nodes.root), PostHiding.makeButton(this, 'hide')); @@ -2804,7 +2804,7 @@ QuoteStrikeThrough = { init: function() { - if (g.VIEW === 'catalog' || !Conf['Reply Hiding'] && !Conf['Reply Hiding Link'] && !Conf['Filter']) { + if (g.VIEW === 'catalog' || !Conf['Reply Hiding Buttons'] && !Conf['Reply Hiding Link'] && !Conf['Filter']) { return; } return Post.prototype.callbacks.push({ @@ -2831,7 +2831,7 @@ ThreadHiding = { init: function() { - if (g.VIEW !== 'index' || !Conf['Thread Hiding'] && !Conf['Thread Hiding Link']) { + if (g.VIEW !== 'index' || !Conf['Thread Hiding Buttons'] && !Conf['Thread Hiding Link']) { return; } this.db = new DataBoard('hiddenThreads'); @@ -2850,7 +2850,7 @@ })) { ThreadHiding.hide(this, data.makeStub); } - if (!Conf['Thread Hiding']) { + if (!Conf['Thread Hiding Buttons']) { return; } return $.prepend(this.OP.nodes.root, ThreadHiding.makeButton(this, 'hide')); @@ -4196,7 +4196,7 @@ el = $.el('label', { id: 'toggleCatalog', href: 'javascript:;', - innerHTML: "Catalog", + innerHTML: "Catalog Links", title: "Turn catalog links " + (Conf['Header catalog links'] ? 'off' : 'on') + "." }); input = $('input', el); @@ -4659,7 +4659,7 @@ $.on(this.headerToggler, 'change', this.toggleBarVisibility); createSubEntry = Header.createSubEntry; subEntries = []; - _ref = ['sticky top', 'sticky bottom', 'top']; + _ref = ['Sticky top', 'Sticky bottom', 'Top']; for (_i = 0, _len = _ref.length; _i < _len; _i++) { setting = _ref[_i]; subEntries.push(createSubEntry(setting)); @@ -4850,15 +4850,15 @@ $.rmClass(doc, 'bottom'); $.rmClass(Header.nav, 'dialog'); switch (setting) { - case 'sticky top': + case 'Sticky top': $.addClass(doc, 'top'); $.addClass(doc, 'fixed'); return $.addClass(Header.nav, 'dialog'); - case 'sticky bottom': + case 'Sticky bottom': $.addClass(doc, 'fixed'); $.addClass(doc, 'bottom'); return $.addClass(Header.nav, 'dialog'); - case 'top': + case 'Top': return $.addClass(doc, 'top'); } }, @@ -4909,7 +4909,7 @@ var headRect, top; top = post.getBoundingClientRect().top; - if (Conf['Boards Navigation'] === 'sticky top') { + if (Conf['Boards Navigation'] === 'Sticky top') { headRect = Header.bar.getBoundingClientRect(); top += -headRect.top - headRect.height; } @@ -6398,7 +6398,7 @@ Unread = { init: function() { - if (g.VIEW !== 'thread' || !Conf['Unread Count'] && !Conf['Unread Tab Icon']) { + if (g.VIEW !== 'thread' || !Conf['Unread Count'] && !Conf['Unread Favicon']) { return; } this.db = new DataBoard('lastReadPosts', this.sync); @@ -6612,7 +6612,7 @@ if (Conf['Unread Count']) { d.title = "" + (count || !Conf['Hide Unread Count at (0)'] ? "(" + count + ") " : '') + (g.DEAD ? "/" + g.BOARD + "/ - 404" : "" + Unread.title); } - if (!Conf['Unread Tab Icon']) { + if (!Conf['Unread Favicon']) { return; } Favicon.el.href = g.DEAD ? Unread.postsQuotingYou.length ? Favicon.unreadDeadY : count ? Favicon.unreadDead : Favicon.dead : count ? Unread.postsQuotingYou.length ? Favicon.unreadY : Favicon.unread : Favicon["default"]; @@ -8312,7 +8312,7 @@ $.event('AddMenuEntry', { type: 'header', el: this.controls, - order: 115 + order: 98 }); $.on(d, '4chanXInitFinished', this.setup); return Post.prototype.callbacks.push({ @@ -8876,7 +8876,7 @@ 'Show Stubs': 'Stubs', 'Image Auto-Gif': 'Auto-GIF', 'Expand From Current': '', - 'Unread Favicon': 'Unread Tab Icon', + 'Unread Tab Icon': 'Unread Favicon', 'Post in Title': 'Thread Excerpt', 'Auto Hide QR': '', 'Open Reply in New Tab': '', @@ -8885,6 +8885,8 @@ 'Quote Preview': 'Quote Previewing', 'Indicate OP quote': 'Mark OP Quotes', 'Indicate Cross-thread Quotes': 'Mark Cross-thread Quotes', + 'Reply Hiding': 'Reply Hiding Buttons', + 'Thread Hiding': 'Thread Hiding Buttons', 'uniqueid': 'uniqueID', 'mod': 'capcode', 'country': 'flag', @@ -8998,7 +9000,7 @@ rice: function(section) { var archiver, event, input, inputs, items, name, toSelect, _i, _j, _len, _len1, _ref; - section.innerHTML = "
\n Archiver\n Select an Archiver for this board:\n \n
\n
\n Custom Board Navigation is disabled.\n
\n
In the following, board can translate to a board ID (a, b, etc...), the current board (current), or the Status/Twitter link (status, @).
\n
\n For example:
\n [ toggle-all ] [current-title] [g-title / a-title / jp-title] [x / wsg / h] [t-text:\"Piracy\"]
\n will give you
\n [ + ] [Technology] [Technology / Anime & Manga / Otaku Culture] [x / wsg / h] [Piracy]
\n if you are on /g/.\n
\n
Board link: board
\n
Title link: board-title
\n
Board link (Replace with title when on that board): board-replace
\n
Full text link: board-full
\n
Custom text link: board-text:\"VIP Board\"
\n
Index-only link: board-index
\n
Catalog-only link: board-catalog
\n
Combinations are possible: board-index-text:\"VIP Index\"
\n
Full board list toggle: toggle-all
\n
\n\n
\n Time Formatting is disabled.\n
:
\n
Supported format specifiers:
\n
Day: %a, %A, %d, %e
\n
Month: %m, %b, %B
\n
Year: %y
\n
Hour: %k, %H, %l, %I, %p, %P
\n
Minute: %M
\n
Second: %S
\n
\n\n
\n Quote Backlinks formatting is disabled.\n
:
\n
\n\n
\n File Info Formatting is disabled.\n
:
\n
Link: %l (truncated), %L (untruncated), %T (Unix timestamp)
\n
Original file name: %n (truncated), %N (untruncated), %t (Unix timestamp)
\n
Spoiler indicator: %p
\n
Size: %B (Bytes), %K (KB), %M (MB), %s (4chan default)
\n
Resolution: %r (Displays 'PDF' for PDF files)
\n
\n\n
\n Unread Tab Icon is disabled.\n \n \n
\n\n
\n \n \n \n \n \n
"; + section.innerHTML = "
\n Archiver\n Select an Archiver for this board:\n \n
\n
\n Custom Board Navigation is disabled.\n
\n
In the following, board can translate to a board ID (a, b, etc...), the current board (current), or the Status/Twitter link (status, @).
\n
\n For example:
\n [ toggle-all ] [current-title] [g-title / a-title / jp-title] [x / wsg / h] [t-text:\"Piracy\"]
\n will give you
\n [ + ] [Technology] [Technology / Anime & Manga / Otaku Culture] [x / wsg / h] [Piracy]
\n if you are on /g/.\n
\n
Board link: board
\n
Title link: board-title
\n
Board link (Replace with title when on that board): board-replace
\n
Full text link: board-full
\n
Custom text link: board-text:\"VIP Board\"
\n
Index-only link: board-index
\n
Catalog-only link: board-catalog
\n
Combinations are possible: board-index-text:\"VIP Index\"
\n
Full board list toggle: toggle-all
\n
\n\n
\n Time Formatting is disabled.\n
:
\n
Supported format specifiers:
\n
Day: %a, %A, %d, %e
\n
Month: %m, %b, %B
\n
Year: %y
\n
Hour: %k, %H, %l, %I, %p, %P
\n
Minute: %M
\n
Second: %S
\n
\n\n
\n Quote Backlinks formatting is disabled.\n
:
\n
\n\n
\n File Info Formatting is disabled.\n
:
\n
Link: %l (truncated), %L (untruncated), %T (Unix timestamp)
\n
Original file name: %n (truncated), %N (untruncated), %t (Unix timestamp)
\n
Spoiler indicator: %p
\n
Size: %B (Bytes), %K (KB), %M (MB), %s (4chan default)
\n
Resolution: %r (Displays 'PDF' for PDF files)
\n
\n\n
\n Unread Favicon is disabled.\n \n \n
\n\n
\n \n \n \n \n \n
"; items = {}; inputs = {}; _ref = ['boardnav', 'time', 'backlink', 'fileInfo', 'favicon', 'usercss']; @@ -9077,7 +9079,7 @@ }, favicon: function() { Favicon["switch"](); - if (g.VIEW === 'thread' && Conf['Unread Tab Icon']) { + if (g.VIEW === 'thread' && Conf['Unread Favicon']) { Unread.update(); } return this.nextElementSibling.innerHTML = "\n\n\n"; @@ -9234,8 +9236,8 @@ 'Linkify': Linkify, 'Resurrect Quotes': Quotify, 'Filter': Filter, - 'Thread Hiding': ThreadHiding, - 'Reply Hiding': PostHiding, + 'Thread Hiding Buttons': ThreadHiding, + 'Reply Hiding Buttons': PostHiding, 'Recursive': Recursive, 'Strike-through Quotes': QuoteStrikeThrough, 'Quick Reply': QR, diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index f848ae464..b9ee3fdca 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -52,7 +52,7 @@ Config = { main: { 'Miscellaneous': { - 'Catalog Links': [true, 'Turn Navigation links into links to each board\'s catalog.'], + 'Catalog Links': [true, 'Add toggle link in header menu to turn Navigation links into links to each board\'s catalog.'], 'External Catalog': [false, 'Link to external catalog instead of the internal one.'], 'Custom Board Navigation': [true, 'Show custom links instead of the full board list.'], 'QR Shortcut': [false, 'Adds a small [QR] link in the header.'], @@ -78,8 +78,8 @@ 'Anonymize': [false, 'Make everyone Anonymous.'], 'Filter': [true, 'Self-moderation placebo.'], 'Recursive Hiding': [true, 'Hide replies of hidden posts, recursively.'], - 'Thread Hiding': [true, 'Add buttons to hide entire threads.'], - 'Reply Hiding': [true, 'Add buttons to hide single replies.'], + 'Thread Hiding Buttons': [true, 'Add buttons to hide entire threads.'], + 'Reply Hiding Buttons': [true, 'Add buttons to hide single replies.'], 'Stubs': [true, 'Show stubs of hidden threads / replies.'] }, 'Images': { @@ -104,7 +104,7 @@ 'Thread Updater': [true, 'Fetch and insert new replies. Has more options in its own dialog.'], 'Unread Count': [true, 'Show the unread posts count in the tab title.'], 'Hide Unread Count at (0)': [false, 'Hide the unread posts count when it reaches 0.'], - 'Unread Tab Icon': [true, 'Show a different favicon when there are unread posts.'], + 'Unread Favicon': [true, 'Show a different favicon when there are unread posts.'], 'Unread Line': [true, 'Show a line to distinguish read posts from unread ones.'], 'Scroll to Last Read Post': [true, 'Scroll back to the last read post when reopening a thread.'], 'Thread Excerpt': [true, 'Show an excerpt of the thread in the tab title.'], @@ -160,20 +160,20 @@ }, sauces: "https://www.google.com/searchbyimage?image_url=%TURL\nhttp://iqdb.org/?url=%TURL\n#//tineye.com/search?url=%TURL\n#http://saucenao.com/search.php?url=%TURL\n#http://3d.iqdb.org/?url=%TURL\n#http://regex.info/exif.cgi?imgurl=%URL\n# uploaders:\n#http://imgur.com/upload?url=%URL;text:Upload to imgur\n#http://ompldr.org/upload?url1=%URL;text:Upload to ompldr\n# \"View Same\" in archives:\n#//archive.foolz.us/_/search/image/%MD5/;text:View same on foolz\n#//archive.foolz.us/%board/search/image/%MD5/;text:View same on foolz /%board/\n#//archive.installgentoo.net/%board/image/%MD5;text:View same on installgentoo /%board/", 'Custom CSS': false, - 'Boards Navigation': 'sticky top', + 'Boards Navigation': 'Sticky top', 'Header auto-hide': false, 'Footer auto-hide': true, 'Header catalog links': false, boardnav: '[ toggle-all ] [current-title]', time: '%m/%d/%y(%a)%H:%M:%S', backlink: '>>%id', - fileInfo: '%l (%p%s, %r)', + fileInfo: '%L (%p%s, %r)', favicon: 'ferongr', usercss: '', hotkeys: { 'Toggle board list': ['Ctrl+b', 'Toggle the full board list.'], - 'Open empty QR': ['q', 'Open QR without post number inserted.'], - 'Open QR': ['Shift+q', 'Open QR with post number inserted.'], + 'Open empty QR': ['l', 'Open QR without post number inserted.'], + 'Open QR': ['Shift+l', 'Open QR with post number inserted.'], 'Open settings': ['Alt+o', 'Open Settings.'], 'Close': ['Esc', 'Close Settings, Notifications or QR.'], 'Spoiler tags': ['Ctrl+s', 'Insert spoiler tags.'], @@ -2517,7 +2517,7 @@ PostHiding = { init: function() { - if (g.VIEW === 'catalog' || !Conf['Reply Hiding'] && !Conf['Reply Hiding Link']) { + if (g.VIEW === 'catalog' || !Conf['Reply Hiding Buttons'] && !Conf['Reply Hiding Link']) { return; } this.db = new DataBoard('hiddenPosts'); @@ -2544,7 +2544,7 @@ Recursive.add(PostHiding.hide, this, data.makeStub, true); } } - if (!Conf['Reply Hiding']) { + if (!Conf['Reply Hiding Buttons']) { return; } return $.replace($('.sideArrows', this.nodes.root), PostHiding.makeButton(this, 'hide')); @@ -2795,7 +2795,7 @@ QuoteStrikeThrough = { init: function() { - if (g.VIEW === 'catalog' || !Conf['Reply Hiding'] && !Conf['Reply Hiding Link'] && !Conf['Filter']) { + if (g.VIEW === 'catalog' || !Conf['Reply Hiding Buttons'] && !Conf['Reply Hiding Link'] && !Conf['Filter']) { return; } return Post.prototype.callbacks.push({ @@ -2822,7 +2822,7 @@ ThreadHiding = { init: function() { - if (g.VIEW !== 'index' || !Conf['Thread Hiding'] && !Conf['Thread Hiding Link']) { + if (g.VIEW !== 'index' || !Conf['Thread Hiding Buttons'] && !Conf['Thread Hiding Link']) { return; } this.db = new DataBoard('hiddenThreads'); @@ -2841,7 +2841,7 @@ })) { ThreadHiding.hide(this, data.makeStub); } - if (!Conf['Thread Hiding']) { + if (!Conf['Thread Hiding Buttons']) { return; } return $.prepend(this.OP.nodes.root, ThreadHiding.makeButton(this, 'hide')); @@ -4187,7 +4187,7 @@ el = $.el('label', { id: 'toggleCatalog', href: 'javascript:;', - innerHTML: "Catalog", + innerHTML: "Catalog Links", title: "Turn catalog links " + (Conf['Header catalog links'] ? 'off' : 'on') + "." }); input = $('input', el); @@ -4650,7 +4650,7 @@ $.on(this.headerToggler, 'change', this.toggleBarVisibility); createSubEntry = Header.createSubEntry; subEntries = []; - _ref = ['sticky top', 'sticky bottom', 'top']; + _ref = ['Sticky top', 'Sticky bottom', 'Top']; for (_i = 0, _len = _ref.length; _i < _len; _i++) { setting = _ref[_i]; subEntries.push(createSubEntry(setting)); @@ -4841,15 +4841,15 @@ $.rmClass(doc, 'bottom'); $.rmClass(Header.nav, 'dialog'); switch (setting) { - case 'sticky top': + case 'Sticky top': $.addClass(doc, 'top'); $.addClass(doc, 'fixed'); return $.addClass(Header.nav, 'dialog'); - case 'sticky bottom': + case 'Sticky bottom': $.addClass(doc, 'fixed'); $.addClass(doc, 'bottom'); return $.addClass(Header.nav, 'dialog'); - case 'top': + case 'Top': return $.addClass(doc, 'top'); } }, @@ -4900,7 +4900,7 @@ var headRect, top; top = post.getBoundingClientRect().top; - if (Conf['Boards Navigation'] === 'sticky top') { + if (Conf['Boards Navigation'] === 'Sticky top') { headRect = Header.bar.getBoundingClientRect(); top += -headRect.top - headRect.height; } @@ -6389,7 +6389,7 @@ Unread = { init: function() { - if (g.VIEW !== 'thread' || !Conf['Unread Count'] && !Conf['Unread Tab Icon']) { + if (g.VIEW !== 'thread' || !Conf['Unread Count'] && !Conf['Unread Favicon']) { return; } this.db = new DataBoard('lastReadPosts', this.sync); @@ -6603,7 +6603,7 @@ if (Conf['Unread Count']) { d.title = "" + (count || !Conf['Hide Unread Count at (0)'] ? "(" + count + ") " : '') + (g.DEAD ? "/" + g.BOARD + "/ - 404" : "" + Unread.title); } - if (!Conf['Unread Tab Icon']) { + if (!Conf['Unread Favicon']) { return; } Favicon.el.href = g.DEAD ? Unread.postsQuotingYou.length ? Favicon.unreadDeadY : count ? Favicon.unreadDead : Favicon.dead : count ? Unread.postsQuotingYou.length ? Favicon.unreadY : Favicon.unread : Favicon["default"]; @@ -8328,7 +8328,7 @@ $.event('AddMenuEntry', { type: 'header', el: this.controls, - order: 115 + order: 98 }); $.on(d, '4chanXInitFinished', this.setup); return Post.prototype.callbacks.push({ @@ -8894,7 +8894,7 @@ 'Show Stubs': 'Stubs', 'Image Auto-Gif': 'Auto-GIF', 'Expand From Current': '', - 'Unread Favicon': 'Unread Tab Icon', + 'Unread Tab Icon': 'Unread Favicon', 'Post in Title': 'Thread Excerpt', 'Auto Hide QR': '', 'Open Reply in New Tab': '', @@ -8903,6 +8903,8 @@ 'Quote Preview': 'Quote Previewing', 'Indicate OP quote': 'Mark OP Quotes', 'Indicate Cross-thread Quotes': 'Mark Cross-thread Quotes', + 'Reply Hiding': 'Reply Hiding Buttons', + 'Thread Hiding': 'Thread Hiding Buttons', 'uniqueid': 'uniqueID', 'mod': 'capcode', 'country': 'flag', @@ -9016,7 +9018,7 @@ rice: function(section) { var archiver, event, input, inputs, items, name, toSelect, _i, _j, _len, _len1, _ref; - section.innerHTML = "
\n Archiver\n Select an Archiver for this board:\n \n
\n
\n Custom Board Navigation is disabled.\n
\n
In the following, board can translate to a board ID (a, b, etc...), the current board (current), or the Status/Twitter link (status, @).
\n
\n For example:
\n [ toggle-all ] [current-title] [g-title / a-title / jp-title] [x / wsg / h] [t-text:\"Piracy\"]
\n will give you
\n [ + ] [Technology] [Technology / Anime & Manga / Otaku Culture] [x / wsg / h] [Piracy]
\n if you are on /g/.\n
\n
Board link: board
\n
Title link: board-title
\n
Board link (Replace with title when on that board): board-replace
\n
Full text link: board-full
\n
Custom text link: board-text:\"VIP Board\"
\n
Index-only link: board-index
\n
Catalog-only link: board-catalog
\n
Combinations are possible: board-index-text:\"VIP Index\"
\n
Full board list toggle: toggle-all
\n
\n\n
\n Time Formatting is disabled.\n
:
\n
Supported format specifiers:
\n
Day: %a, %A, %d, %e
\n
Month: %m, %b, %B
\n
Year: %y
\n
Hour: %k, %H, %l, %I, %p, %P
\n
Minute: %M
\n
Second: %S
\n
\n\n
\n Quote Backlinks formatting is disabled.\n
:
\n
\n\n
\n File Info Formatting is disabled.\n
:
\n
Link: %l (truncated), %L (untruncated), %T (Unix timestamp)
\n
Original file name: %n (truncated), %N (untruncated), %t (Unix timestamp)
\n
Spoiler indicator: %p
\n
Size: %B (Bytes), %K (KB), %M (MB), %s (4chan default)
\n
Resolution: %r (Displays 'PDF' for PDF files)
\n
\n\n
\n Unread Tab Icon is disabled.\n \n \n
\n\n
\n \n \n \n \n \n
"; + section.innerHTML = "
\n Archiver\n Select an Archiver for this board:\n \n
\n
\n Custom Board Navigation is disabled.\n
\n
In the following, board can translate to a board ID (a, b, etc...), the current board (current), or the Status/Twitter link (status, @).
\n
\n For example:
\n [ toggle-all ] [current-title] [g-title / a-title / jp-title] [x / wsg / h] [t-text:\"Piracy\"]
\n will give you
\n [ + ] [Technology] [Technology / Anime & Manga / Otaku Culture] [x / wsg / h] [Piracy]
\n if you are on /g/.\n
\n
Board link: board
\n
Title link: board-title
\n
Board link (Replace with title when on that board): board-replace
\n
Full text link: board-full
\n
Custom text link: board-text:\"VIP Board\"
\n
Index-only link: board-index
\n
Catalog-only link: board-catalog
\n
Combinations are possible: board-index-text:\"VIP Index\"
\n
Full board list toggle: toggle-all
\n
\n\n
\n Time Formatting is disabled.\n
:
\n
Supported format specifiers:
\n
Day: %a, %A, %d, %e
\n
Month: %m, %b, %B
\n
Year: %y
\n
Hour: %k, %H, %l, %I, %p, %P
\n
Minute: %M
\n
Second: %S
\n
\n\n
\n Quote Backlinks formatting is disabled.\n
:
\n
\n\n
\n File Info Formatting is disabled.\n
:
\n
Link: %l (truncated), %L (untruncated), %T (Unix timestamp)
\n
Original file name: %n (truncated), %N (untruncated), %t (Unix timestamp)
\n
Spoiler indicator: %p
\n
Size: %B (Bytes), %K (KB), %M (MB), %s (4chan default)
\n
Resolution: %r (Displays 'PDF' for PDF files)
\n
\n\n
\n Unread Favicon is disabled.\n \n \n
\n\n
\n \n \n \n \n \n
"; items = {}; inputs = {}; _ref = ['boardnav', 'time', 'backlink', 'fileInfo', 'favicon', 'usercss']; @@ -9095,7 +9097,7 @@ }, favicon: function() { Favicon["switch"](); - if (g.VIEW === 'thread' && Conf['Unread Tab Icon']) { + if (g.VIEW === 'thread' && Conf['Unread Favicon']) { Unread.update(); } return this.nextElementSibling.innerHTML = "\n\n\n"; @@ -9252,8 +9254,8 @@ 'Linkify': Linkify, 'Resurrect Quotes': Quotify, 'Filter': Filter, - 'Thread Hiding': ThreadHiding, - 'Reply Hiding': PostHiding, + 'Thread Hiding Buttons': ThreadHiding, + 'Reply Hiding Buttons': PostHiding, 'Recursive': Recursive, 'Strike-through Quotes': QuoteStrikeThrough, 'Quick Reply': QR, diff --git a/builds/crx/script.js b/builds/crx/script.js index 50415340c..06c82635b 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -8,7 +8,7 @@ Config = { main: { 'Miscellaneous': { - 'Catalog Links': [true, 'Turn Navigation links into links to each board\'s catalog.'], + 'Catalog Links': [true, 'Add toggle link in header menu to turn Navigation links into links to each board\'s catalog.'], 'External Catalog': [false, 'Link to external catalog instead of the internal one.'], 'Custom Board Navigation': [true, 'Show custom links instead of the full board list.'], 'QR Shortcut': [false, 'Adds a small [QR] link in the header.'], @@ -34,8 +34,8 @@ 'Anonymize': [false, 'Make everyone Anonymous.'], 'Filter': [true, 'Self-moderation placebo.'], 'Recursive Hiding': [true, 'Hide replies of hidden posts, recursively.'], - 'Thread Hiding': [true, 'Add buttons to hide entire threads.'], - 'Reply Hiding': [true, 'Add buttons to hide single replies.'], + 'Thread Hiding Buttons': [true, 'Add buttons to hide entire threads.'], + 'Reply Hiding Buttons': [true, 'Add buttons to hide single replies.'], 'Stubs': [true, 'Show stubs of hidden threads / replies.'] }, 'Images': { @@ -61,7 +61,7 @@ 'Thread Updater': [true, 'Fetch and insert new replies. Has more options in its own dialog.'], 'Unread Count': [true, 'Show the unread posts count in the tab title.'], 'Hide Unread Count at (0)': [false, 'Hide the unread posts count when it reaches 0.'], - 'Unread Tab Icon': [true, 'Show a different favicon when there are unread posts.'], + 'Unread Favicon': [true, 'Show a different favicon when there are unread posts.'], 'Unread Line': [true, 'Show a line to distinguish read posts from unread ones.'], 'Scroll to Last Read Post': [true, 'Scroll back to the last read post when reopening a thread.'], 'Thread Excerpt': [true, 'Show an excerpt of the thread in the tab title.'], @@ -116,20 +116,20 @@ }, sauces: "https://www.google.com/searchbyimage?image_url=%TURL\nhttp://iqdb.org/?url=%TURL\n#//tineye.com/search?url=%TURL\n#http://saucenao.com/search.php?url=%TURL\n#http://3d.iqdb.org/?url=%TURL\n#http://regex.info/exif.cgi?imgurl=%URL\n# uploaders:\n#http://imgur.com/upload?url=%URL;text:Upload to imgur\n#http://ompldr.org/upload?url1=%URL;text:Upload to ompldr\n# \"View Same\" in archives:\n#//archive.foolz.us/_/search/image/%MD5/;text:View same on foolz\n#//archive.foolz.us/%board/search/image/%MD5/;text:View same on foolz /%board/\n#//archive.installgentoo.net/%board/image/%MD5;text:View same on installgentoo /%board/", 'Custom CSS': false, - 'Boards Navigation': 'sticky top', + 'Boards Navigation': 'Sticky top', 'Header auto-hide': false, 'Footer auto-hide': true, 'Header catalog links': false, boardnav: '[ toggle-all ] [current-title]', time: '%m/%d/%y(%a)%H:%M:%S', backlink: '>>%id', - fileInfo: '%l (%p%s, %r)', + fileInfo: '%L (%p%s, %r)', favicon: 'ferongr', usercss: '', hotkeys: { 'Toggle board list': ['Ctrl+b', 'Toggle the full board list.'], - 'Open empty QR': ['q', 'Open QR without post number inserted.'], - 'Open QR': ['Shift+q', 'Open QR with post number inserted.'], + 'Open empty QR': ['l', 'Open QR without post number inserted.'], + 'Open QR': ['Shift+l', 'Open QR with post number inserted.'], 'Open settings': ['Alt+o', 'Open Settings.'], 'Close': ['Esc', 'Close Settings, Notifications or QR.'], 'Spoiler tags': ['Ctrl+s', 'Insert spoiler tags.'], @@ -2440,7 +2440,7 @@ PostHiding = { init: function() { - if (g.VIEW === 'catalog' || !Conf['Reply Hiding'] && !Conf['Reply Hiding Link']) { + if (g.VIEW === 'catalog' || !Conf['Reply Hiding Buttons'] && !Conf['Reply Hiding Link']) { return; } this.db = new DataBoard('hiddenPosts'); @@ -2467,7 +2467,7 @@ Recursive.add(PostHiding.hide, this, data.makeStub, true); } } - if (!Conf['Reply Hiding']) { + if (!Conf['Reply Hiding Buttons']) { return; } return $.replace($('.sideArrows', this.nodes.root), PostHiding.makeButton(this, 'hide')); @@ -2718,7 +2718,7 @@ QuoteStrikeThrough = { init: function() { - if (g.VIEW === 'catalog' || !Conf['Reply Hiding'] && !Conf['Reply Hiding Link'] && !Conf['Filter']) { + if (g.VIEW === 'catalog' || !Conf['Reply Hiding Buttons'] && !Conf['Reply Hiding Link'] && !Conf['Filter']) { return; } return Post.prototype.callbacks.push({ @@ -2745,7 +2745,7 @@ ThreadHiding = { init: function() { - if (g.VIEW !== 'index' || !Conf['Thread Hiding'] && !Conf['Thread Hiding Link']) { + if (g.VIEW !== 'index' || !Conf['Thread Hiding Buttons'] && !Conf['Thread Hiding Link']) { return; } this.db = new DataBoard('hiddenThreads'); @@ -2764,7 +2764,7 @@ })) { ThreadHiding.hide(this, data.makeStub); } - if (!Conf['Thread Hiding']) { + if (!Conf['Thread Hiding Buttons']) { return; } return $.prepend(this.OP.nodes.root, ThreadHiding.makeButton(this, 'hide')); @@ -4110,7 +4110,7 @@ el = $.el('label', { id: 'toggleCatalog', href: 'javascript:;', - innerHTML: "Catalog", + innerHTML: "Catalog Links", title: "Turn catalog links " + (Conf['Header catalog links'] ? 'off' : 'on') + "." }); input = $('input', el); @@ -4573,7 +4573,7 @@ $.on(this.headerToggler, 'change', this.toggleBarVisibility); createSubEntry = Header.createSubEntry; subEntries = []; - _ref = ['sticky top', 'sticky bottom', 'top']; + _ref = ['Sticky top', 'Sticky bottom', 'Top']; for (_i = 0, _len = _ref.length; _i < _len; _i++) { setting = _ref[_i]; subEntries.push(createSubEntry(setting)); @@ -4764,15 +4764,15 @@ $.rmClass(doc, 'bottom'); $.rmClass(Header.nav, 'dialog'); switch (setting) { - case 'sticky top': + case 'Sticky top': $.addClass(doc, 'top'); $.addClass(doc, 'fixed'); return $.addClass(Header.nav, 'dialog'); - case 'sticky bottom': + case 'Sticky bottom': $.addClass(doc, 'fixed'); $.addClass(doc, 'bottom'); return $.addClass(Header.nav, 'dialog'); - case 'top': + case 'Top': return $.addClass(doc, 'top'); } }, @@ -4823,7 +4823,7 @@ var headRect, top; top = post.getBoundingClientRect().top; - if (Conf['Boards Navigation'] === 'sticky top') { + if (Conf['Boards Navigation'] === 'Sticky top') { headRect = Header.bar.getBoundingClientRect(); top += -headRect.top - headRect.height; } @@ -6312,7 +6312,7 @@ Unread = { init: function() { - if (g.VIEW !== 'thread' || !Conf['Unread Count'] && !Conf['Unread Tab Icon']) { + if (g.VIEW !== 'thread' || !Conf['Unread Count'] && !Conf['Unread Favicon']) { return; } this.db = new DataBoard('lastReadPosts', this.sync); @@ -6532,7 +6532,7 @@ }, $.SECOND); } } - if (!Conf['Unread Tab Icon']) { + if (!Conf['Unread Favicon']) { return; } return Favicon.el.href = g.DEAD ? Unread.postsQuotingYou.length ? Favicon.unreadDeadY : count ? Favicon.unreadDead : Favicon.dead : count ? Unread.postsQuotingYou.length ? Favicon.unreadY : Favicon.unread : Favicon["default"]; @@ -8232,7 +8232,7 @@ $.event('AddMenuEntry', { type: 'header', el: this.controls, - order: 115 + order: 98 }); $.on(d, '4chanXInitFinished', this.setup); return Post.prototype.callbacks.push({ @@ -8796,7 +8796,7 @@ 'Show Stubs': 'Stubs', 'Image Auto-Gif': 'Auto-GIF', 'Expand From Current': '', - 'Unread Favicon': 'Unread Tab Icon', + 'Unread Tab Icon': 'Unread Favicon', 'Post in Title': 'Thread Excerpt', 'Auto Hide QR': '', 'Open Reply in New Tab': '', @@ -8805,6 +8805,8 @@ 'Quote Preview': 'Quote Previewing', 'Indicate OP quote': 'Mark OP Quotes', 'Indicate Cross-thread Quotes': 'Mark Cross-thread Quotes', + 'Reply Hiding': 'Reply Hiding Buttons', + 'Thread Hiding': 'Thread Hiding Buttons', 'uniqueid': 'uniqueID', 'mod': 'capcode', 'country': 'flag', @@ -8918,7 +8920,7 @@ rice: function(section) { var archiver, event, input, inputs, items, name, toSelect, _i, _j, _len, _len1, _ref; - section.innerHTML = "
\n Archiver\n Select an Archiver for this board:\n \n
\n
\n Custom Board Navigation is disabled.\n
\n
In the following, board can translate to a board ID (a, b, etc...), the current board (current), or the Status/Twitter link (status, @).
\n
\n For example:
\n [ toggle-all ] [current-title] [g-title / a-title / jp-title] [x / wsg / h] [t-text:\"Piracy\"]
\n will give you
\n [ + ] [Technology] [Technology / Anime & Manga / Otaku Culture] [x / wsg / h] [Piracy]
\n if you are on /g/.\n
\n
Board link: board
\n
Title link: board-title
\n
Board link (Replace with title when on that board): board-replace
\n
Full text link: board-full
\n
Custom text link: board-text:\"VIP Board\"
\n
Index-only link: board-index
\n
Catalog-only link: board-catalog
\n
Combinations are possible: board-index-text:\"VIP Index\"
\n
Full board list toggle: toggle-all
\n
\n\n
\n Time Formatting is disabled.\n
:
\n
Supported format specifiers:
\n
Day: %a, %A, %d, %e
\n
Month: %m, %b, %B
\n
Year: %y
\n
Hour: %k, %H, %l, %I, %p, %P
\n
Minute: %M
\n
Second: %S
\n
\n\n
\n Quote Backlinks formatting is disabled.\n
:
\n
\n\n
\n File Info Formatting is disabled.\n
:
\n
Link: %l (truncated), %L (untruncated), %T (Unix timestamp)
\n
Original file name: %n (truncated), %N (untruncated), %t (Unix timestamp)
\n
Spoiler indicator: %p
\n
Size: %B (Bytes), %K (KB), %M (MB), %s (4chan default)
\n
Resolution: %r (Displays 'PDF' for PDF files)
\n
\n\n
\n Unread Tab Icon is disabled.\n \n \n
\n\n
\n \n \n \n \n \n
"; + section.innerHTML = "
\n Archiver\n Select an Archiver for this board:\n \n
\n
\n Custom Board Navigation is disabled.\n
\n
In the following, board can translate to a board ID (a, b, etc...), the current board (current), or the Status/Twitter link (status, @).
\n
\n For example:
\n [ toggle-all ] [current-title] [g-title / a-title / jp-title] [x / wsg / h] [t-text:\"Piracy\"]
\n will give you
\n [ + ] [Technology] [Technology / Anime & Manga / Otaku Culture] [x / wsg / h] [Piracy]
\n if you are on /g/.\n
\n
Board link: board
\n
Title link: board-title
\n
Board link (Replace with title when on that board): board-replace
\n
Full text link: board-full
\n
Custom text link: board-text:\"VIP Board\"
\n
Index-only link: board-index
\n
Catalog-only link: board-catalog
\n
Combinations are possible: board-index-text:\"VIP Index\"
\n
Full board list toggle: toggle-all
\n
\n\n
\n Time Formatting is disabled.\n
:
\n
Supported format specifiers:
\n
Day: %a, %A, %d, %e
\n
Month: %m, %b, %B
\n
Year: %y
\n
Hour: %k, %H, %l, %I, %p, %P
\n
Minute: %M
\n
Second: %S
\n
\n\n
\n Quote Backlinks formatting is disabled.\n
:
\n
\n\n
\n File Info Formatting is disabled.\n
:
\n
Link: %l (truncated), %L (untruncated), %T (Unix timestamp)
\n
Original file name: %n (truncated), %N (untruncated), %t (Unix timestamp)
\n
Spoiler indicator: %p
\n
Size: %B (Bytes), %K (KB), %M (MB), %s (4chan default)
\n
Resolution: %r (Displays 'PDF' for PDF files)
\n
\n\n
\n Unread Favicon is disabled.\n \n \n
\n\n
\n \n \n \n \n \n
"; items = {}; inputs = {}; _ref = ['boardnav', 'time', 'backlink', 'fileInfo', 'favicon', 'usercss']; @@ -8997,7 +8999,7 @@ }, favicon: function() { Favicon["switch"](); - if (g.VIEW === 'thread' && Conf['Unread Tab Icon']) { + if (g.VIEW === 'thread' && Conf['Unread Favicon']) { Unread.update(); } return this.nextElementSibling.innerHTML = "\n\n\n"; @@ -9154,8 +9156,8 @@ 'Linkify': Linkify, 'Resurrect Quotes': Quotify, 'Filter': Filter, - 'Thread Hiding': ThreadHiding, - 'Reply Hiding': PostHiding, + 'Thread Hiding Buttons': ThreadHiding, + 'Reply Hiding Buttons': PostHiding, 'Recursive': Recursive, 'Strike-through Quotes': QuoteStrikeThrough, 'Quick Reply': QR, diff --git a/src/config.coffee b/src/config.coffee index 91683b526..ddd7a5e74 100644 --- a/src/config.coffee +++ b/src/config.coffee @@ -3,7 +3,7 @@ Config = 'Miscellaneous': 'Catalog Links': [ true - 'Turn Navigation links into links to each board\'s catalog.' + 'Add toggle link in header menu to turn Navigation links into links to each board\'s catalog.' ] 'External Catalog': [ false @@ -93,11 +93,11 @@ Config = true 'Hide replies of hidden posts, recursively.' ] - 'Thread Hiding': [ + 'Thread Hiding Buttons': [ true 'Add buttons to hide entire threads.' ] - 'Reply Hiding': [ + 'Reply Hiding Buttons': [ true 'Add buttons to hide single replies.' ] @@ -185,7 +185,7 @@ Config = false 'Hide the unread posts count when it reaches 0.' ] - 'Unread Tab Icon': [ + 'Unread Favicon': [ true 'Show a different favicon when there are unread posts.' ] @@ -388,7 +388,7 @@ http://iqdb.org/?url=%TURL 'Custom CSS': false - 'Boards Navigation': 'sticky top' + 'Boards Navigation': 'Sticky top' 'Header auto-hide': false @@ -402,7 +402,7 @@ http://iqdb.org/?url=%TURL backlink: '>>%id' - fileInfo: '%l (%p%s, %r)' + fileInfo: '%L (%p%s, %r)' favicon: 'ferongr' @@ -415,11 +415,11 @@ http://iqdb.org/?url=%TURL 'Toggle the full board list.' ] 'Open empty QR': [ - 'q' + 'l' 'Open QR without post number inserted.' ] 'Open QR': [ - 'Shift+q' + 'Shift+l' 'Open QR with post number inserted.' ] 'Open settings': [ diff --git a/src/features/filtering/replyhiding.coffee b/src/features/filtering/replyhiding.coffee index e29ed5c48..14a6635ea 100644 --- a/src/features/filtering/replyhiding.coffee +++ b/src/features/filtering/replyhiding.coffee @@ -1,6 +1,6 @@ PostHiding = init: -> - return if g.VIEW is 'catalog' or !Conf['Reply Hiding'] and !Conf['Reply Hiding Link'] + return if g.VIEW is 'catalog' or !Conf['Reply Hiding Buttons'] and !Conf['Reply Hiding Link'] @db = new DataBoard 'hiddenPosts' Post::callbacks.push @@ -15,7 +15,7 @@ PostHiding = else Recursive.apply PostHiding.hide, @, data.makeStub, true Recursive.add PostHiding.hide, @, data.makeStub, true - return unless Conf['Reply Hiding'] + return unless Conf['Reply Hiding Buttons'] $.replace $('.sideArrows', @nodes.root), PostHiding.makeButton @, 'hide' menu: diff --git a/src/features/filtering/strikethrough.coffee b/src/features/filtering/strikethrough.coffee index 8813ae38c..53d4e0fc1 100644 --- a/src/features/filtering/strikethrough.coffee +++ b/src/features/filtering/strikethrough.coffee @@ -1,6 +1,6 @@ QuoteStrikeThrough = init: -> - return if g.VIEW is 'catalog' or !Conf['Reply Hiding'] and !Conf['Reply Hiding Link'] and !Conf['Filter'] + return if g.VIEW is 'catalog' or !Conf['Reply Hiding Buttons'] and !Conf['Reply Hiding Link'] and !Conf['Filter'] Post::callbacks.push name: 'Strike-through Quotes' diff --git a/src/features/filtering/threadhiding.coffee b/src/features/filtering/threadhiding.coffee index 69d2af192..83133e6a4 100644 --- a/src/features/filtering/threadhiding.coffee +++ b/src/features/filtering/threadhiding.coffee @@ -1,6 +1,6 @@ ThreadHiding = init: -> - return if g.VIEW isnt 'index' or !Conf['Thread Hiding'] and !Conf['Thread Hiding Link'] + return if g.VIEW isnt 'index' or !Conf['Thread Hiding Buttons'] and !Conf['Thread Hiding Link'] @db = new DataBoard 'hiddenThreads' @syncCatalog() @@ -11,7 +11,7 @@ ThreadHiding = node: -> if data = ThreadHiding.db.get {boardID: @board.ID, threadID: @ID} ThreadHiding.hide @, data.makeStub - return unless Conf['Thread Hiding'] + return unless Conf['Thread Hiding Buttons'] $.prepend @OP.nodes.root, ThreadHiding.makeButton @, 'hide' syncCatalog: -> diff --git a/src/features/misc/cataloglinks.coffee b/src/features/misc/cataloglinks.coffee index 2c67cb29b..8e6696515 100644 --- a/src/features/misc/cataloglinks.coffee +++ b/src/features/misc/cataloglinks.coffee @@ -4,7 +4,7 @@ CatalogLinks = el = $.el 'label', id: 'toggleCatalog' href: 'javascript:;' - innerHTML: "Catalog" + innerHTML: "Catalog Links" title: "Turn catalog links #{if Conf['Header catalog links'] then 'off' else 'on'}." input = $ 'input', el diff --git a/src/features/misc/header.coffee b/src/features/misc/header.coffee index d7caf1549..2d22e0019 100644 --- a/src/features/misc/header.coffee +++ b/src/features/misc/header.coffee @@ -17,7 +17,7 @@ Header = {createSubEntry} = Header subEntries = [] - for setting in ['sticky top', 'sticky bottom', 'top'] + for setting in ['Sticky top', 'Sticky bottom', 'Top'] subEntries.push createSubEntry setting subEntries.push {el: headerToggler} @@ -180,15 +180,15 @@ Header = $.rmClass doc, 'bottom' $.rmClass Header.nav, 'dialog' switch setting - when 'sticky top' + when 'Sticky top' $.addClass doc, 'top' $.addClass doc, 'fixed' $.addClass Header.nav, 'dialog' - when 'sticky bottom' + when 'Sticky bottom' $.addClass doc, 'fixed' $.addClass doc, 'bottom' $.addClass Header.nav, 'dialog' - when 'top' + when 'Top' $.addClass doc, 'top' setBarVisibility: (hide) -> @@ -236,7 +236,7 @@ Header = scrollToPost: (post) -> {top} = post.getBoundingClientRect() - if Conf['Boards Navigation'] is 'sticky top' + if Conf['Boards Navigation'] is 'Sticky top' headRect = Header.bar.getBoundingClientRect() top += - headRect.top - headRect.height (if $.engine is 'webkit' then d.body else doc).scrollTop += top diff --git a/src/features/monitoring/unread.coffee b/src/features/monitoring/unread.coffee index e51ebd721..cd6967aea 100644 --- a/src/features/monitoring/unread.coffee +++ b/src/features/monitoring/unread.coffee @@ -1,6 +1,6 @@ Unread = init: -> - return if g.VIEW isnt 'thread' or !Conf['Unread Count'] and !Conf['Unread Tab Icon'] + return if g.VIEW isnt 'thread' or !Conf['Unread Count'] and !Conf['Unread Favicon'] @db = new DataBoard 'lastReadPosts', @sync @hr = $.el 'hr', @@ -153,7 +153,7 @@ Unread = , $.SECOND <% } %> - return unless Conf['Unread Tab Icon'] + return unless Conf['Unread Favicon'] Favicon.el.href = if g.DEAD diff --git a/src/features/quoting/quotethreading.coffee b/src/features/quoting/quotethreading.coffee index e2e859ae3..a03406bb9 100644 --- a/src/features/quoting/quotethreading.coffee +++ b/src/features/quoting/quotethreading.coffee @@ -16,7 +16,7 @@ QuoteThreading = $.event 'AddMenuEntry', type: 'header' el: @controls - order: 115 + order: 98 $.on d, '4chanXInitFinished', @setup diff --git a/src/main.coffee b/src/main.coffee index 57a452eb5..3077d3d55 100644 --- a/src/main.coffee +++ b/src/main.coffee @@ -75,8 +75,8 @@ Main = 'Linkify': Linkify 'Resurrect Quotes': Quotify 'Filter': Filter - 'Thread Hiding': ThreadHiding - 'Reply Hiding': PostHiding + 'Thread Hiding Buttons': ThreadHiding + 'Reply Hiding Buttons': PostHiding 'Recursive': Recursive 'Strike-through Quotes': QuoteStrikeThrough 'Quick Reply': QR diff --git a/src/settings.coffee b/src/settings.coffee index 6f7ea2da4..80e95a381 100644 --- a/src/settings.coffee +++ b/src/settings.coffee @@ -227,7 +227,7 @@ Settings = 'Show Stubs': 'Stubs' 'Image Auto-Gif': 'Auto-GIF' 'Expand From Current': '' - 'Unread Favicon': 'Unread Tab Icon' + 'Unread Tab Icon': 'Unread Favicon' 'Post in Title': 'Thread Excerpt' 'Auto Hide QR': '' 'Open Reply in New Tab': '' @@ -236,6 +236,8 @@ Settings = 'Quote Preview': 'Quote Previewing' 'Indicate OP quote': 'Mark OP Quotes' 'Indicate Cross-thread Quotes': 'Mark Cross-thread Quotes' + 'Reply Hiding': 'Reply Hiding Buttons' + 'Thread Hiding': 'Thread Hiding Buttons' # filter 'uniqueid': 'uniqueID' 'mod': 'capcode' @@ -434,7 +436,7 @@ Settings =
- Unread Tab Icon is disabled. + Unread Favicon is disabled.