From a2ac3d73e12170b61c06cbd4d63fd3b2d2a551f0 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Tue, 21 May 2013 18:37:13 +0200 Subject: [PATCH 01/20] Fix building of deleted files. --- src/General/Build.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/General/Build.coffee b/src/General/Build.coffee index 691668805..f24e7ad5e 100644 --- a/src/General/Build.coffee +++ b/src/General/Build.coffee @@ -113,11 +113,11 @@ Build = if file?.isDeleted fileHtml = if isOP - "
" + + "
" + "File deleted." + "
" else - "
" + + "
" + "File deleted." + "
" else if file From b5caa77df8e20e722168f820e5901dbe540a440f Mon Sep 17 00:00:00 2001 From: Mayhem Date: Tue, 21 May 2013 21:07:41 +0200 Subject: [PATCH 02/20] Use vh for image expansion's "Fit height" on Chrome and Firefox. Should give much better performance when resizing for example. --- css/style.css | 3 +++ src/Images/ImageExpand.coffee | 13 +++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/css/style.css b/css/style.css index d53f3b960..c364037d5 100644 --- a/css/style.css +++ b/css/style.css @@ -532,6 +532,9 @@ a.hide-announcement { clear: both; display: table; } +:root.fit-height .full-image { + max-height: 100vh; +} :root.fit-width .full-image { max-width: 100%; } diff --git a/src/Images/ImageExpand.coffee b/src/Images/ImageExpand.coffee index 38284688f..18d91fcc1 100644 --- a/src/Images/ImageExpand.coffee +++ b/src/Images/ImageExpand.coffee @@ -51,16 +51,20 @@ ImageExpand = $.queueTask func, post return setFitness: -> - {checked} = @ - (if checked then $.addClass else $.rmClass) doc, @name.toLowerCase().replace /\s+/g, '-' + (if @checked then $.addClass else $.rmClass) doc, @name.toLowerCase().replace /\s+/g, '-' +<% if (type === 'userjs') { %> +# XXX Opera doesn't support CSS vh. return unless @name is 'Fit height' - if checked + if @checked $.on window, 'resize', ImageExpand.resize unless ImageExpand.style ImageExpand.style = $.addStyle null ImageExpand.resize() else $.off window, 'resize', ImageExpand.resize + resize: -> + ImageExpand.style.textContent = ":root.fit-height .full-image {max-height:#{doc.clientHeight}px}" +<% } %> toggle: (post) -> {thumb} = post.file @@ -189,6 +193,3 @@ ImageExpand = $.event 'change', null, input $.on input, 'change', $.cb.checked el: label - - resize: -> - ImageExpand.style.textContent = ":root.fit-height .full-image {max-height:#{doc.clientHeight}px}" From d9cad02d726b480ee4ade8e00e5c52f79781892f Mon Sep 17 00:00:00 2001 From: seaweedchan Date: Fri, 24 May 2013 23:40:50 -0700 Subject: [PATCH 03/20] Fix #86 --- LICENSE | 2 +- builds/4chan-X.js | 8 ++++++-- builds/4chan-X.user.js | 8 ++++++-- builds/crx/script.js | 8 ++++++-- src/Posting/QuickReply.coffee | 7 ++++++- 5 files changed, 25 insertions(+), 8 deletions(-) diff --git a/LICENSE b/LICENSE index 0e9931518..f8b9c7b4d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.2.8 - 2013-05-20 +* 4chan X - Version 1.2.8 - 2013-05-24 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X.js b/builds/4chan-X.js index 93647696f..0533ed65c 100644 --- a/builds/4chan-X.js +++ b/builds/4chan-X.js @@ -19,7 +19,7 @@ // @icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAgMAAAAqbBEUAAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAHFJREFUKFOt0LENACEIBdBv4Qju4wgWanEj3D6OcIVMKaitYHEU/jwTCQj8W75kiVCSBvdQ5/AvfVHBin11BgdRq3ysBgfwBDRrj3MCIA+oAQaku/Q1cNctrAmyDl577tOThYt/Y1RBM4DgOHzM0HFTAyLukH/cmRnqAAAAAElFTkSuQmCC // ==/UserScript== /* -* 4chan X - Version 1.2.8 - 2013-05-20 +* 4chan X - Version 1.2.8 - 2013-05-24 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE @@ -4662,7 +4662,11 @@ } $.ready(this.initReady); if (Conf['Persistent QR']) { - $.on(d, '4chanXInitFinished', this.persist); + if (g.BOARD.ID !== 'f') { + $.on(d, '4chanXInitFinished', this.persist); + } else { + $.ready(this.persist); + } } return Post.prototype.callbacks.push({ name: 'Quick Reply', diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 8a7b881c4..c892b8fb0 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -19,7 +19,7 @@ // @icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAgMAAAAqbBEUAAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAHFJREFUKFOt0LENACEIBdBv4Qju4wgWanEj3D6OcIVMKaitYHEU/jwTCQj8W75kiVCSBvdQ5/AvfVHBin11BgdRq3ysBgfwBDRrj3MCIA+oAQaku/Q1cNctrAmyDl577tOThYt/Y1RBM4DgOHzM0HFTAyLukH/cmRnqAAAAAElFTkSuQmCC // ==/UserScript== /* -* 4chan X - Version 1.2.8 - 2013-05-20 +* 4chan X - Version 1.2.8 - 2013-05-24 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE @@ -4646,7 +4646,11 @@ } $.ready(this.initReady); if (Conf['Persistent QR']) { - $.on(d, '4chanXInitFinished', this.persist); + if (g.BOARD.ID !== 'f') { + $.on(d, '4chanXInitFinished', this.persist); + } else { + $.ready(this.persist); + } } return Post.prototype.callbacks.push({ name: 'Quick Reply', diff --git a/builds/crx/script.js b/builds/crx/script.js index ffdba7c90..b7fc37ff6 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript /* -* 4chan X - Version 1.2.8 - 2013-05-20 +* 4chan X - Version 1.2.8 - 2013-05-24 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE @@ -4648,7 +4648,11 @@ } $.ready(this.initReady); if (Conf['Persistent QR']) { - $.on(d, '4chanXInitFinished', this.persist); + if (g.BOARD.ID !== 'f') { + $.on(d, '4chanXInitFinished', this.persist); + } else { + $.ready(this.persist); + } } return Post.prototype.callbacks.push({ name: 'Quick Reply', diff --git a/src/Posting/QuickReply.coffee b/src/Posting/QuickReply.coffee index 8fe333372..5228baedb 100644 --- a/src/Posting/QuickReply.coffee +++ b/src/Posting/QuickReply.coffee @@ -26,7 +26,12 @@ QR = $.asap (-> doc), -> $.addClass doc, 'hide-original-post-form' $.ready @initReady - $.on d, '4chanXInitFinished', @persist if Conf['Persistent QR'] + + if Conf['Persistent QR'] + unless g.BOARD.ID is 'f' + $.on d, '4chanXInitFinished', @persist + else + $.ready @persist Post::callbacks.push name: 'Quick Reply' From cd533799ea05648b6e6b8ab60f5752ca7fbf7a5a Mon Sep 17 00:00:00 2001 From: seaweedchan Date: Fri, 24 May 2013 23:59:39 -0700 Subject: [PATCH 04/20] Add WM Mode for YouTube videos, #85 http://stackoverflow.com/questions/886864/differences-between-using-wmode-transparent-opaque-or-window-for-an-embe --- builds/4chan-X.js | 2 +- builds/4chan-X.user.js | 2 +- builds/crx/script.js | 2 +- src/Linkification/Linkify.coffee | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/builds/4chan-X.js b/builds/4chan-X.js index 0533ed65c..7be0cdedc 100644 --- a/builds/4chan-X.js +++ b/builds/4chan-X.js @@ -4418,7 +4418,7 @@ regExp: /.*(?:youtu.be\/|youtube.*v=|youtube.*\/embed\/|youtube.*\/v\/|youtube.*videos\/)([^#\&\?]*)\??(t\=.*)?/, el: function() { return $.el('iframe', { - src: "//www.youtube.com/embed/" + this.name + (this.option ? '#' + this.option : '') + src: "//www.youtube.com/embed/" + this.name + (this.option ? '#' + this.option : '') + "?wmode=opaque" }); }, title: { diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index c892b8fb0..1e2c35e3f 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -4402,7 +4402,7 @@ regExp: /.*(?:youtu.be\/|youtube.*v=|youtube.*\/embed\/|youtube.*\/v\/|youtube.*videos\/)([^#\&\?]*)\??(t\=.*)?/, el: function() { return $.el('iframe', { - src: "//www.youtube.com/embed/" + this.name + (this.option ? '#' + this.option : '') + src: "//www.youtube.com/embed/" + this.name + (this.option ? '#' + this.option : '') + "?wmode=opaque" }); }, title: { diff --git a/builds/crx/script.js b/builds/crx/script.js index b7fc37ff6..e35fcfc2f 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -4404,7 +4404,7 @@ regExp: /.*(?:youtu.be\/|youtube.*v=|youtube.*\/embed\/|youtube.*\/v\/|youtube.*videos\/)([^#\&\?]*)\??(t\=.*)?/, el: function() { return $.el('iframe', { - src: "//www.youtube.com/embed/" + this.name + (this.option ? '#' + this.option : '') + src: "//www.youtube.com/embed/" + this.name + (this.option ? '#' + this.option : '') + "?wmode=opaque" }); }, title: { diff --git a/src/Linkification/Linkify.coffee b/src/Linkification/Linkify.coffee index 8862fd11d..411239dbd 100644 --- a/src/Linkification/Linkify.coffee +++ b/src/Linkification/Linkify.coffee @@ -151,7 +151,7 @@ Linkify = regExp: /.*(?:youtu.be\/|youtube.*v=|youtube.*\/embed\/|youtube.*\/v\/|youtube.*videos\/)([^#\&\?]*)\??(t\=.*)?/ el: -> $.el 'iframe', - src: "//www.youtube.com/embed/#{@name}#{if @option then '#' + @option else ''}" + src: "//www.youtube.com/embed/#{@name}#{if @option then '#' + @option else ''}?wmode=opaque" title: api: -> "https://gdata.youtube.com/feeds/api/videos/#{@name}?alt=json&fields=title/text(),yt:noembed,app:control/yt:state/@reasonCode" text: -> JSON.parse(@responseText).entry.title.$t From 11730a46738d7482c2f265daf3ac70204d860b40 Mon Sep 17 00:00:00 2001 From: seaweedchan Date: Sat, 25 May 2013 00:14:28 -0700 Subject: [PATCH 05/20] I dont want these changes Main.coffee change created flashing of certain elements --- builds/4chan-X.js | 1 + builds/4chan-X.user.js | 1 + builds/crx/script.js | 1 + src/General/Config.coffee | 2 +- src/General/Main.coffee | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/builds/4chan-X.js b/builds/4chan-X.js index deb726751..bd157205d 100644 --- a/builds/4chan-X.js +++ b/builds/4chan-X.js @@ -10116,6 +10116,7 @@ } Conf['selectedArchives'] = {}; $.get(Conf, Main.initFeatures); + $.on(d, '4chanMainInit', Main.initStyle); return $.asap((function() { var _ref; diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 53648dba7..75e3add23 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -10127,6 +10127,7 @@ } Conf['selectedArchives'] = {}; $.get(Conf, Main.initFeatures); + $.on(d, '4chanMainInit', Main.initStyle); return $.asap((function() { var _ref; diff --git a/builds/crx/script.js b/builds/crx/script.js index c6ea3132e..9f62d21b1 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -10108,6 +10108,7 @@ } Conf['selectedArchives'] = {}; $.get(Conf, Main.initFeatures); + $.on(d, '4chanMainInit', Main.initStyle); return $.asap((function() { var _ref; diff --git a/src/General/Config.coffee b/src/General/Config.coffee index 173038f73..e615e3636 100644 --- a/src/General/Config.coffee +++ b/src/General/Config.coffee @@ -479,7 +479,7 @@ http://iqdb.org/?url=%TURL backlink: '>>%id' - fileInfo: '%l (%p%s, %r)' + fileInfo: '%L (%p%s, %r)' favicon: 'ferongr' diff --git a/src/General/Main.coffee b/src/General/Main.coffee index 76150ac8e..bb583ea34 100644 --- a/src/General/Main.coffee +++ b/src/General/Main.coffee @@ -18,6 +18,7 @@ Main = $.get Conf, Main.initFeatures + $.on d, '4chanMainInit', Main.initStyle $.asap (-> d.head and $('link[rel="canonical"]', d.head) or d.readyState in ['interactive', 'complete']), Main.initStyle From caa438b92bc60f7e0465eab464fbe1e0c720796d Mon Sep 17 00:00:00 2001 From: seaweedchan Date: Sat, 25 May 2013 00:20:49 -0700 Subject: [PATCH 06/20] Release 4chan X v1.2.9. --- CHANGELOG.md | 11 +++++++++++ LICENSE | 2 +- builds/4chan-X.js | 8 ++++---- builds/4chan-X.meta.js | 2 +- builds/4chan-X.user.js | 8 ++++---- builds/crx/manifest.json | 2 +- builds/crx/script.js | 6 +++--- latest.js | 2 +- package.json | 2 +- 9 files changed, 27 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6cbaa9de6..59d324883 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +### v1.2.9 +*2013-05-25* + +**seaweedchan**: +- Fix YouTube videos in Firefox taking z-index priority +- Fix Persistent QR not working for /f/ + +**zixaphir** +- New option: `Image Prefetching`. Adds a toggle to the header menu for per-thread prefetching. +- Make Advance on contract + ### v1.2.8 *2013-05-20* diff --git a/LICENSE b/LICENSE index 9db28436d..27f2a5a9b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.2.8 - 2013-05-25 +* 4chan X - Version 1.2.9 - 2013-05-25 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X.js b/builds/4chan-X.js index bd157205d..dea56fe19 100644 --- a/builds/4chan-X.js +++ b/builds/4chan-X.js @@ -1,7 +1,7 @@ // Generated by CoffeeScript // ==UserScript== // @name 4chan X -// @version 1.2.8 +// @version 1.2.9 // @namespace 4chan-X // @description Cross-browser userscript for maximum lurking on 4chan. // @license MIT; https://github.com/seaweedchan/4chan-x/blob/master/LICENSE @@ -19,7 +19,7 @@ // @icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAgMAAAAqbBEUAAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAHFJREFUKFOt0LENACEIBdBv4Qju4wgWanEj3D6OcIVMKaitYHEU/jwTCQj8W75kiVCSBvdQ5/AvfVHBin11BgdRq3ysBgfwBDRrj3MCIA+oAQaku/Q1cNctrAmyDl577tOThYt/Y1RBM4DgOHzM0HFTAyLukH/cmRnqAAAAAElFTkSuQmCC // ==/UserScript== /* -* 4chan X - Version 1.2.8 - 2013-05-25 +* 4chan X - Version 1.2.9 - 2013-05-25 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE @@ -259,7 +259,7 @@ }, time: '%m/%d/%y(%a)%H:%M:%S', backlink: '>>%id', - fileInfo: '%l (%p%s, %r)', + fileInfo: '%L (%p%s, %r)', favicon: 'ferongr', usercss: '', hotkeys: { @@ -320,7 +320,7 @@ doc = d.documentElement; g = { - VERSION: '1.2.8', + VERSION: '1.2.9', NAMESPACE: '4chan X.', boards: {}, threads: {}, diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js index 67371cc1c..3a31798d3 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.2.8 +// @version 1.2.9 // @namespace 4chan-X // @description Cross-browser userscript for maximum lurking on 4chan. // @license MIT; https://github.com/seaweedchan/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 75e3add23..fcf5dc266 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.2.8 +// @version 1.2.9 // @namespace 4chan-X // @description Cross-browser userscript for maximum lurking on 4chan. // @license MIT; https://github.com/seaweedchan/4chan-x/blob/master/LICENSE @@ -19,7 +19,7 @@ // @icon data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwAgMAAAAqbBEUAAAACVBMVEUAAGcAAABmzDNZt9VtAAAAAXRSTlMAQObYZgAAAHFJREFUKFOt0LENACEIBdBv4Qju4wgWanEj3D6OcIVMKaitYHEU/jwTCQj8W75kiVCSBvdQ5/AvfVHBin11BgdRq3ysBgfwBDRrj3MCIA+oAQaku/Q1cNctrAmyDl577tOThYt/Y1RBM4DgOHzM0HFTAyLukH/cmRnqAAAAAElFTkSuQmCC // ==/UserScript== /* -* 4chan X - Version 1.2.8 - 2013-05-25 +* 4chan X - Version 1.2.9 - 2013-05-25 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE @@ -260,7 +260,7 @@ }, time: '%m/%d/%y(%a)%H:%M:%S', backlink: '>>%id', - fileInfo: '%l (%p%s, %r)', + fileInfo: '%L (%p%s, %r)', favicon: 'ferongr', usercss: '', hotkeys: { @@ -317,7 +317,7 @@ doc = d.documentElement; g = { - VERSION: '1.2.8', + VERSION: '1.2.9', NAMESPACE: '4chan X.', boards: {}, threads: {}, diff --git a/builds/crx/manifest.json b/builds/crx/manifest.json index e139a5835..0f466a3a5 100644 --- a/builds/crx/manifest.json +++ b/builds/crx/manifest.json @@ -1,6 +1,6 @@ { "name": "4chan X", - "version": "1.2.8", + "version": "1.2.9", "manifest_version": 2, "description": "Cross-browser userscript for maximum lurking on 4chan.", "icons": { diff --git a/builds/crx/script.js b/builds/crx/script.js index 9f62d21b1..27aa92d73 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript /* -* 4chan X - Version 1.2.8 - 2013-05-25 +* 4chan X - Version 1.2.9 - 2013-05-25 * * Licensed under the MIT license. * https://github.com/seaweedchan/4chan-x/blob/master/LICENSE @@ -241,7 +241,7 @@ }, time: '%m/%d/%y(%a)%H:%M:%S', backlink: '>>%id', - fileInfo: '%l (%p%s, %r)', + fileInfo: '%L (%p%s, %r)', favicon: 'ferongr', usercss: '', hotkeys: { @@ -298,7 +298,7 @@ doc = d.documentElement; g = { - VERSION: '1.2.8', + VERSION: '1.2.9', NAMESPACE: '4chan X.', boards: {}, threads: {}, diff --git a/latest.js b/latest.js index dadc54d53..6a50b7985 100644 --- a/latest.js +++ b/latest.js @@ -1 +1 @@ -postMessage({version:'1.2.8'},'*') +postMessage({version:'1.2.9'},'*') diff --git a/package.json b/package.json index 77d8aa411..ba8631cce 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "4chan-X", - "version": "1.2.8", + "version": "1.2.9", "description": "Cross-browser userscript for maximum lurking on 4chan.", "meta": { "name": "4chan X", From 7530ce04176101959886119d429be732fe476c36 Mon Sep 17 00:00:00 2001 From: seaweedchan Date: Sat, 25 May 2013 00:21:16 -0700 Subject: [PATCH 07/20] Changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59d324883..d2ee97953 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ - Fix YouTube videos in Firefox taking z-index priority - Fix Persistent QR not working for /f/ -**zixaphir** +**zixaphir**: - New option: `Image Prefetching`. Adds a toggle to the header menu for per-thread prefetching. - Make Advance on contract From f0b569f3e46235c2c015a3950c8214914b8b149e Mon Sep 17 00:00:00 2001 From: seaweedchan Date: Sat, 25 May 2013 00:23:33 -0700 Subject: [PATCH 08/20] Changelog... again I should stop making commits so late. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d2ee97953..962834360 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ **zixaphir**: - New option: `Image Prefetching`. Adds a toggle to the header menu for per-thread prefetching. -- Make Advance on contract +- Make Advance on contract work with Fappe Tyme ### v1.2.8 *2013-05-20* From b6c132c493d0123d2e9ba99f6242992b65fb7130 Mon Sep 17 00:00:00 2001 From: Jordan Bates Date: Sat, 25 May 2013 13:10:43 -0700 Subject: [PATCH 09/20] Revert Zixaphir X, #87 --- builds/4chan-X.js | 2 +- builds/4chan-X.user.js | 2 +- builds/crx/script.js | 2 +- src/General/Main.coffee | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/builds/4chan-X.js b/builds/4chan-X.js index dea56fe19..45d6b6ce4 100644 --- a/builds/4chan-X.js +++ b/builds/4chan-X.js @@ -10120,7 +10120,7 @@ return $.asap((function() { var _ref; - return d.head && $('link[rel="canonical"]', d.head) || ((_ref = d.readyState) === 'interactive' || _ref === 'complete'); + return d.head && $('link[rel="shortcut icon"]', d.head) || ((_ref = d.readyState) === 'interactive' || _ref === 'complete'); }), Main.initStyle); }, initFeatures: function(items) { diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index fcf5dc266..79b0df103 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -10131,7 +10131,7 @@ return $.asap((function() { var _ref; - return d.head && $('link[rel="canonical"]', d.head) || ((_ref = d.readyState) === 'interactive' || _ref === 'complete'); + return d.head && $('link[rel="shortcut icon"]', d.head) || ((_ref = d.readyState) === 'interactive' || _ref === 'complete'); }), Main.initStyle); }, initFeatures: function(items) { diff --git a/builds/crx/script.js b/builds/crx/script.js index 27aa92d73..28ccf2b49 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -10112,7 +10112,7 @@ return $.asap((function() { var _ref; - return d.head && $('link[rel="canonical"]', d.head) || ((_ref = d.readyState) === 'interactive' || _ref === 'complete'); + return d.head && $('link[rel="shortcut icon"]', d.head) || ((_ref = d.readyState) === 'interactive' || _ref === 'complete'); }), Main.initStyle); }, initFeatures: function(items) { diff --git a/src/General/Main.coffee b/src/General/Main.coffee index bb583ea34..8c66f027d 100644 --- a/src/General/Main.coffee +++ b/src/General/Main.coffee @@ -19,7 +19,7 @@ Main = $.get Conf, Main.initFeatures $.on d, '4chanMainInit', Main.initStyle - $.asap (-> d.head and $('link[rel="canonical"]', d.head) or d.readyState in ['interactive', 'complete']), + $.asap (-> d.head and $('link[rel="shortcut icon"]', d.head) or d.readyState in ['interactive', 'complete']), Main.initStyle initFeatures: (items) -> From e9b4c133ac95fabc55590c0e76342539ea511db8 Mon Sep 17 00:00:00 2001 From: Mayhem Date: Sat, 25 May 2013 22:24:10 +0200 Subject: [PATCH 10/20] Fix #1124. --- src/Posting/QR.coffee | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Posting/QR.coffee b/src/Posting/QR.coffee index a3d179f09..f219575ec 100644 --- a/src/Posting/QR.coffee +++ b/src/Posting/QR.coffee @@ -175,6 +175,8 @@ QR = loadPersonas: (type, arr) -> list = $ "#list-#{type}", QR.nodes.el for val in arr + # XXX Firefox displays empty