diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ce41cb71..1a414304f 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ The links to individual versions below are to copies of the script with the upda ## v1.11.0 +**v1.11.0.1** *(2015-06-16)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.0.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.0.1/builds/4chan-X-noupdate.crx "Chromium version")] +- Merge v1.10.14.3: Fix words being cut off in non-Javascript captcha. + **v1.11.0.0** *(2015-06-14)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.0.0/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.0.0/builds/4chan-X-noupdate.crx "Chromium version")] - Based on v1.10.14.2. - Gallery now preloads the next image in sequence. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index bcdb34611..95a1cd397 100644 Binary files a/builds/4chan-X-beta.crx and b/builds/4chan-X-beta.crx differ diff --git a/builds/4chan-X-beta.meta.js b/builds/4chan-X-beta.meta.js index 344e3f860..1b09ecb81 100644 --- a/builds/4chan-X-beta.meta.js +++ b/builds/4chan-X-beta.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X beta -// @version 1.11.0.0 +// @version 1.11.0.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -10,6 +10,8 @@ // @match *://sys.4chan.org/* // @match *://a.4cdn.org/* // @match *://i.4cdn.org/* +// @match *://www.4chan.org/banned +// @match *://www.4chan.org/feedback // @match https://www.google.com/recaptcha/api2/anchor?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @match https://www.google.com/recaptcha/api2/frame?*&k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @match *://www.google.com/recaptcha/api/fallback?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc diff --git a/builds/4chan-X-beta.user.js b/builds/4chan-X-beta.user.js index ff1d01568..31e540421 100644 --- a/builds/4chan-X-beta.user.js +++ b/builds/4chan-X-beta.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X beta -// @version 1.11.0.0 +// @version 1.11.0.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -11,6 +11,8 @@ // @match *://sys.4chan.org/* // @match *://a.4cdn.org/* // @match *://i.4cdn.org/* +// @match *://www.4chan.org/banned +// @match *://www.4chan.org/feedback // @match https://www.google.com/recaptcha/api2/anchor?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @match https://www.google.com/recaptcha/api2/frame?*&k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @match *://www.google.com/recaptcha/api/fallback?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc @@ -397,7 +399,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.0.0', + VERSION: '1.11.0.1', NAMESPACE: '4chan X.', boards: {} }; @@ -15458,7 +15460,12 @@ }; Report = { - css: ':root:not(.js-enabled) #g-recaptcha {\n height: auto;\n}', + css: "noscript div:first-child, noscript iframe {\n" + +" height: 422px !important;\n" + +"}\n" + +":root:not(.js-enabled) #g-recaptcha {\n" + +" height: auto;\n" + +"}", init: function() { var match; if (!(/\bmode=report\b/.test(location.search) && (match = location.search.match(/\bno=(\d+)/)))) { @@ -16343,6 +16350,12 @@ } return; } + if (location.hostname === 'www.4chan.org') { + $.onExists(d.documentElement, 'body', false, function() { + return $.addStyle(Main.cssWWW); + }); + return; + } g.threads = new SimpleDict(); g.posts = new SimpleDict(); pathname = location.pathname.split('/'); @@ -17312,6 +17325,9 @@ " 0% {transform:rotate(0deg);}\n" + " 100% {transform:rotate(359deg);}\n" + "}\n" + +"noscript div:first-child, noscript iframe {\n" + +" height: 422px !important;\n" + +"}\n" + "/* General */\n" + ".dialog {\n" + " border: 1px solid;\n" + @@ -19700,6 +19716,12 @@ ":root.photon div.boardTitle {\n" + " font-family: sans-serif !important;\n" + " text-shadow: 1px 1px 1px rgba(0,74,153,0.6);\n" + +"}", + cssWWW: "noscript div:first-child, noscript iframe {\n" + +" height: 422px !important;\n" + +"}\n" + +"#captcha-cnt {\n" + +" height: auto;\n" + "}", features: [['Polyfill', Polyfill], ['Redirect', Redirect], ['Header', Header], ['Catalog Links', CatalogLinks], ['Settings', Settings], ['Index Generator', Index], ['Disable Autoplay', AntiAutoplay], ['Announcement Hiding', PSAHiding], ['Fourchan thingies', Fourchan], ['Color User IDs', IDColor], ['Highlight by User ID', IDHighlight], ['Custom CSS', CustomCSS], ['Linkify', Linkify], ['Reveal Spoilers', RemoveSpoilers], ['Resurrect Quotes', Quotify], ['Filter', Filter], ['Thread Hiding Buttons', ThreadHiding], ['Reply Hiding Buttons', PostHiding], ['Recursive', Recursive], ['Strike-through Quotes', QuoteStrikeThrough], ['Quick Reply', QR], ['Menu', Menu], ['Index Generator (Menu)', Index.menu], ['Report Link', ReportLink], ['Thread Hiding (Menu)', ThreadHiding.menu], ['Reply Hiding (Menu)', PostHiding.menu], ['Delete Link', DeleteLink], ['Filter (Menu)', Filter.menu], ['Download Link', DownloadLink], ['Archive Link', ArchiveLink], ['Quote Inlining', QuoteInline], ['Quote Previewing', QuotePreview], ['Quote Backlinks', QuoteBacklink], ['Mark Quotes of You', QuoteYou], ['Mark OP Quotes', QuoteOP], ['Mark Cross-thread Quotes', QuoteCT], ['Anonymize', Anonymize], ['Time Formatting', Time], ['Relative Post Dates', RelativeDates], ['File Info Formatting', FileInfo], ['Fappe Tyme', FappeTyme], ['Gallery', Gallery], ['Gallery (menu)', Gallery.menu], ['Sauce', Sauce], ['Image Expansion', ImageExpand], ['Image Expansion (Menu)', ImageExpand.menu], ['Reveal Spoiler Thumbnails', RevealSpoilers], ['Image Loading', ImageLoader], ['Image Hover', ImageHover], ['Volume Control', Volume], ['WEBM Metadata', Metadata], ['Comment Expansion', ExpandComment], ['Thread Expansion', ExpandThread], ['Thread Excerpt', ThreadExcerpt], ['Favicon', Favicon], ['Unread', Unread], ['Quote Threading', QuoteThreading], ['Thread Stats', ThreadStats], ['Thread Updater', ThreadUpdater], ['Thread Watcher', ThreadWatcher], ['Thread Watcher (Menu)', ThreadWatcher.menu], ['Mark New IPs', MarkNewIPs], ['Index Navigation', Nav], ['Keybinds', Keybinds], ['Banner', Banner], ['Flash Features', Flash]] }; diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index 2599a61f0..34a46e26f 100644 Binary files a/builds/4chan-X-noupdate.crx and b/builds/4chan-X-noupdate.crx differ diff --git a/builds/4chan-X-noupdate.user.js b/builds/4chan-X-noupdate.user.js index 4c9519bab..efc946774 100644 --- a/builds/4chan-X-noupdate.user.js +++ b/builds/4chan-X-noupdate.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X -// @version 1.11.0.0 +// @version 1.11.0.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -11,6 +11,8 @@ // @match *://sys.4chan.org/* // @match *://a.4cdn.org/* // @match *://i.4cdn.org/* +// @match *://www.4chan.org/banned +// @match *://www.4chan.org/feedback // @match https://www.google.com/recaptcha/api2/anchor?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @match https://www.google.com/recaptcha/api2/frame?*&k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @match *://www.google.com/recaptcha/api/fallback?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc @@ -396,7 +398,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.0.0', + VERSION: '1.11.0.1', NAMESPACE: '4chan X.', boards: {} }; @@ -15457,7 +15459,12 @@ }; Report = { - css: ':root:not(.js-enabled) #g-recaptcha {\n height: auto;\n}', + css: "noscript div:first-child, noscript iframe {\n" + +" height: 422px !important;\n" + +"}\n" + +":root:not(.js-enabled) #g-recaptcha {\n" + +" height: auto;\n" + +"}", init: function() { var match; if (!(/\bmode=report\b/.test(location.search) && (match = location.search.match(/\bno=(\d+)/)))) { @@ -16342,6 +16349,12 @@ } return; } + if (location.hostname === 'www.4chan.org') { + $.onExists(d.documentElement, 'body', false, function() { + return $.addStyle(Main.cssWWW); + }); + return; + } g.threads = new SimpleDict(); g.posts = new SimpleDict(); pathname = location.pathname.split('/'); @@ -17311,6 +17324,9 @@ " 0% {transform:rotate(0deg);}\n" + " 100% {transform:rotate(359deg);}\n" + "}\n" + +"noscript div:first-child, noscript iframe {\n" + +" height: 422px !important;\n" + +"}\n" + "/* General */\n" + ".dialog {\n" + " border: 1px solid;\n" + @@ -19699,6 +19715,12 @@ ":root.photon div.boardTitle {\n" + " font-family: sans-serif !important;\n" + " text-shadow: 1px 1px 1px rgba(0,74,153,0.6);\n" + +"}", + cssWWW: "noscript div:first-child, noscript iframe {\n" + +" height: 422px !important;\n" + +"}\n" + +"#captcha-cnt {\n" + +" height: auto;\n" + "}", features: [['Polyfill', Polyfill], ['Redirect', Redirect], ['Header', Header], ['Catalog Links', CatalogLinks], ['Settings', Settings], ['Index Generator', Index], ['Disable Autoplay', AntiAutoplay], ['Announcement Hiding', PSAHiding], ['Fourchan thingies', Fourchan], ['Color User IDs', IDColor], ['Highlight by User ID', IDHighlight], ['Custom CSS', CustomCSS], ['Linkify', Linkify], ['Reveal Spoilers', RemoveSpoilers], ['Resurrect Quotes', Quotify], ['Filter', Filter], ['Thread Hiding Buttons', ThreadHiding], ['Reply Hiding Buttons', PostHiding], ['Recursive', Recursive], ['Strike-through Quotes', QuoteStrikeThrough], ['Quick Reply', QR], ['Menu', Menu], ['Index Generator (Menu)', Index.menu], ['Report Link', ReportLink], ['Thread Hiding (Menu)', ThreadHiding.menu], ['Reply Hiding (Menu)', PostHiding.menu], ['Delete Link', DeleteLink], ['Filter (Menu)', Filter.menu], ['Download Link', DownloadLink], ['Archive Link', ArchiveLink], ['Quote Inlining', QuoteInline], ['Quote Previewing', QuotePreview], ['Quote Backlinks', QuoteBacklink], ['Mark Quotes of You', QuoteYou], ['Mark OP Quotes', QuoteOP], ['Mark Cross-thread Quotes', QuoteCT], ['Anonymize', Anonymize], ['Time Formatting', Time], ['Relative Post Dates', RelativeDates], ['File Info Formatting', FileInfo], ['Fappe Tyme', FappeTyme], ['Gallery', Gallery], ['Gallery (menu)', Gallery.menu], ['Sauce', Sauce], ['Image Expansion', ImageExpand], ['Image Expansion (Menu)', ImageExpand.menu], ['Reveal Spoiler Thumbnails', RevealSpoilers], ['Image Loading', ImageLoader], ['Image Hover', ImageHover], ['Volume Control', Volume], ['WEBM Metadata', Metadata], ['Comment Expansion', ExpandComment], ['Thread Expansion', ExpandThread], ['Thread Excerpt', ThreadExcerpt], ['Favicon', Favicon], ['Unread', Unread], ['Quote Threading', QuoteThreading], ['Thread Stats', ThreadStats], ['Thread Updater', ThreadUpdater], ['Thread Watcher', ThreadWatcher], ['Thread Watcher (Menu)', ThreadWatcher.menu], ['Mark New IPs', MarkNewIPs], ['Index Navigation', Nav], ['Keybinds', Keybinds], ['Banner', Banner], ['Flash Features', Flash]] }; diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 21ae5c0d8..0f91f0fd7 100644 Binary files a/builds/4chan-X.crx and b/builds/4chan-X.crx differ diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js index ef171b2ac..47c8af820 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.11.0.0 +// @version 1.11.0.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -10,6 +10,8 @@ // @match *://sys.4chan.org/* // @match *://a.4cdn.org/* // @match *://i.4cdn.org/* +// @match *://www.4chan.org/banned +// @match *://www.4chan.org/feedback // @match https://www.google.com/recaptcha/api2/anchor?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @match https://www.google.com/recaptcha/api2/frame?*&k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @match *://www.google.com/recaptcha/api/fallback?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 500a483d2..adf3b2fea 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X -// @version 1.11.0.0 +// @version 1.11.0.1 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -11,6 +11,8 @@ // @match *://sys.4chan.org/* // @match *://a.4cdn.org/* // @match *://i.4cdn.org/* +// @match *://www.4chan.org/banned +// @match *://www.4chan.org/feedback // @match https://www.google.com/recaptcha/api2/anchor?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @match https://www.google.com/recaptcha/api2/frame?*&k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @match *://www.google.com/recaptcha/api/fallback?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc @@ -397,7 +399,7 @@ doc = d.documentElement; g = { - VERSION: '1.11.0.0', + VERSION: '1.11.0.1', NAMESPACE: '4chan X.', boards: {} }; @@ -15458,7 +15460,12 @@ }; Report = { - css: ':root:not(.js-enabled) #g-recaptcha {\n height: auto;\n}', + css: "noscript div:first-child, noscript iframe {\n" + +" height: 422px !important;\n" + +"}\n" + +":root:not(.js-enabled) #g-recaptcha {\n" + +" height: auto;\n" + +"}", init: function() { var match; if (!(/\bmode=report\b/.test(location.search) && (match = location.search.match(/\bno=(\d+)/)))) { @@ -16343,6 +16350,12 @@ } return; } + if (location.hostname === 'www.4chan.org') { + $.onExists(d.documentElement, 'body', false, function() { + return $.addStyle(Main.cssWWW); + }); + return; + } g.threads = new SimpleDict(); g.posts = new SimpleDict(); pathname = location.pathname.split('/'); @@ -17312,6 +17325,9 @@ " 0% {transform:rotate(0deg);}\n" + " 100% {transform:rotate(359deg);}\n" + "}\n" + +"noscript div:first-child, noscript iframe {\n" + +" height: 422px !important;\n" + +"}\n" + "/* General */\n" + ".dialog {\n" + " border: 1px solid;\n" + @@ -19700,6 +19716,12 @@ ":root.photon div.boardTitle {\n" + " font-family: sans-serif !important;\n" + " text-shadow: 1px 1px 1px rgba(0,74,153,0.6);\n" + +"}", + cssWWW: "noscript div:first-child, noscript iframe {\n" + +" height: 422px !important;\n" + +"}\n" + +"#captcha-cnt {\n" + +" height: auto;\n" + "}", features: [['Polyfill', Polyfill], ['Redirect', Redirect], ['Header', Header], ['Catalog Links', CatalogLinks], ['Settings', Settings], ['Index Generator', Index], ['Disable Autoplay', AntiAutoplay], ['Announcement Hiding', PSAHiding], ['Fourchan thingies', Fourchan], ['Color User IDs', IDColor], ['Highlight by User ID', IDHighlight], ['Custom CSS', CustomCSS], ['Linkify', Linkify], ['Reveal Spoilers', RemoveSpoilers], ['Resurrect Quotes', Quotify], ['Filter', Filter], ['Thread Hiding Buttons', ThreadHiding], ['Reply Hiding Buttons', PostHiding], ['Recursive', Recursive], ['Strike-through Quotes', QuoteStrikeThrough], ['Quick Reply', QR], ['Menu', Menu], ['Index Generator (Menu)', Index.menu], ['Report Link', ReportLink], ['Thread Hiding (Menu)', ThreadHiding.menu], ['Reply Hiding (Menu)', PostHiding.menu], ['Delete Link', DeleteLink], ['Filter (Menu)', Filter.menu], ['Download Link', DownloadLink], ['Archive Link', ArchiveLink], ['Quote Inlining', QuoteInline], ['Quote Previewing', QuotePreview], ['Quote Backlinks', QuoteBacklink], ['Mark Quotes of You', QuoteYou], ['Mark OP Quotes', QuoteOP], ['Mark Cross-thread Quotes', QuoteCT], ['Anonymize', Anonymize], ['Time Formatting', Time], ['Relative Post Dates', RelativeDates], ['File Info Formatting', FileInfo], ['Fappe Tyme', FappeTyme], ['Gallery', Gallery], ['Gallery (menu)', Gallery.menu], ['Sauce', Sauce], ['Image Expansion', ImageExpand], ['Image Expansion (Menu)', ImageExpand.menu], ['Reveal Spoiler Thumbnails', RevealSpoilers], ['Image Loading', ImageLoader], ['Image Hover', ImageHover], ['Volume Control', Volume], ['WEBM Metadata', Metadata], ['Comment Expansion', ExpandComment], ['Thread Expansion', ExpandThread], ['Thread Excerpt', ThreadExcerpt], ['Favicon', Favicon], ['Unread', Unread], ['Quote Threading', QuoteThreading], ['Thread Stats', ThreadStats], ['Thread Updater', ThreadUpdater], ['Thread Watcher', ThreadWatcher], ['Thread Watcher (Menu)', ThreadWatcher.menu], ['Mark New IPs', MarkNewIPs], ['Index Navigation', Nav], ['Keybinds', Keybinds], ['Banner', Banner], ['Flash Features', Flash]] }; diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index d3b9837ec..63022a0da 100644 Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml index 78c8c6f3a..181ecc209 100644 --- a/builds/updates-beta.xml +++ b/builds/updates-beta.xml @@ -1,7 +1,7 @@ - + diff --git a/builds/updates.xml b/builds/updates.xml index 424963579..23248da20 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index fe05eb37d..1e8251e70 100755 --- a/package.json +++ b/package.json @@ -3,8 +3,8 @@ "description": "Cross-browser userscript for maximum lurking on 4chan.", "meta": { "name": "4chan X", - "version": "1.11.0.0", - "date": "2015-06-14T08:23:24.605Z", + "version": "1.11.0.1", + "date": "2015-06-16T17:48:44.746Z", "repo": "https://github.com/ccd0/4chan-x/", "page": "https://github.com/ccd0/4chan-x", "downloads": "https://ccd0.github.io/4chan-x/builds/",