diff --git a/CHANGELOG.md b/CHANGELOG.md index 89f6d7fa2..449151384 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +### v1.7.42 +*2014-05-18* + **ccd0** - Greasemonkey version may now work in dwb, but nothing is guaranteed, nor will I be regularly testing in this browser. diff --git a/LICENSE b/LICENSE index 115ad8caf..abaf804ef 100755 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ /* -* 4chan X - Version 1.7.41 - 2014-05-17 +* 4chan X - Version 1.7.42 - 2014-05-18 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js index b9ea3af7a..852902a73 100755 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.7.41 +// @version 1.7.42 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index b1a15aa32..308617c98 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.7.41 +// @version 1.7.42 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -24,7 +24,7 @@ // ==/UserScript== /* -* 4chan X - Version 1.7.41 - 2014-05-17 +* 4chan X - Version 1.7.42 - 2014-05-18 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -372,7 +372,7 @@ doc = d.documentElement; g = { - VERSION: '1.7.41', + VERSION: '1.7.42', NAMESPACE: '4chan X.', boards: {} }; @@ -400,10 +400,14 @@ return d.getElementById(id); }; - $.ready = function(fc) { + $.ready = function(fc, immediate) { var cb; if (d.readyState !== 'loading') { - $.queueTask(fc); + if (immediate) { + fc(); + } else { + $.queueTask(fc); + } return; } cb = function() { @@ -12878,7 +12882,7 @@ Settings.dialog = dialog = $.el('div', { id: 'fourchanx-settings', className: 'dialog', - innerHTML: '
' + innerHTML: '
' }); $.on($('.export', Settings.dialog), 'click', Settings["export"]); $.on($('.import', Settings.dialog), 'click', Settings["import"]); @@ -13523,12 +13527,14 @@ Conf['CachedTitles'] = []; $.get(Conf, function(items) { $.extend(Conf, items); - return Main.initFeatures(); + return $.asap((function() { + return doc = d.documentElement; + }), Main.initFeatures); }); return $.on(d, '4chanMainInit', Main.initStyle); }, initFeatures: function() { - var err, feature, name, video, _i, _len, _ref, _ref1; + var err, feature, name, onReady, _i, _len, _ref, _ref1; switch (location.hostname) { case 'a.4cdn.org': return; @@ -13536,20 +13542,8 @@ Report.init(); return; case 'i.4cdn.org': - if (Conf['Loop in New Tab'] && document.body && (video = $('video'))) { - Video.configure(video); - $.on(video, 'click', function() { - if (!video.controls) { - if (video.paused) { - return video.play(); - } else { - return video.pause(); - } - } - }); - } - $.ready(function() { - var URL, pathname, _ref; + onReady = function() { + var URL, pathname, video, _ref; if (Conf['404 Redirect'] && ((_ref = d.title) === '4chan - Temporarily Offline' || _ref === '4chan - 404 Not Found')) { Redirect.init(); pathname = location.pathname.split('/'); @@ -13560,8 +13554,20 @@ if (URL) { return location.replace(URL); } + } else if (Conf['Loop in New Tab'] && (video = $('video'))) { + Video.configure(video); + return $.on(video, 'click', function() { + if (!video.controls) { + if (video.paused) { + return video.play(); + } else { + return video.pause(); + } + } + }); } - }); + }; + $.ready(onReady, true); return; } _ref = Main.features; @@ -13717,7 +13723,7 @@ } if (previousversion) { el = $.el('span', { - innerHTML: '4chan X has been updated to version 1.7.41.' + innerHTML: '4chan X has been updated to version 1.7.42.' }); new Notice('info', el, 15); } else { diff --git a/builds/crx.crx b/builds/crx.crx index 016383a0b..e71006ae6 100644 Binary files a/builds/crx.crx and b/builds/crx.crx differ diff --git a/builds/crx/manifest.json b/builds/crx/manifest.json index 96b88fd98..ae99555d1 100755 --- a/builds/crx/manifest.json +++ b/builds/crx/manifest.json @@ -1,6 +1,6 @@ { "name": "4chan X", - "version": "1.7.41", + "version": "1.7.42", "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 ba97a29ff..909334bd1 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -1,6 +1,6 @@ // Generated by CoffeeScript /* -* 4chan X - Version 1.7.41 - 2014-05-17 +* 4chan X - Version 1.7.42 - 2014-05-18 * * Licensed under the MIT license. * https://github.com/ccd0/4chan-x/blob/master/LICENSE @@ -348,7 +348,7 @@ doc = d.documentElement; g = { - VERSION: '1.7.41', + VERSION: '1.7.42', NAMESPACE: '4chan X.', boards: {} }; @@ -376,10 +376,14 @@ return d.getElementById(id); }; - $.ready = function(fc) { + $.ready = function(fc, immediate) { var cb; if (d.readyState !== 'loading') { - $.queueTask(fc); + if (immediate) { + fc(); + } else { + $.queueTask(fc); + } return; } cb = function() { @@ -12884,7 +12888,7 @@ Settings.dialog = dialog = $.el('div', { id: 'fourchanx-settings', className: 'dialog', - innerHTML: '
' + innerHTML: '
' }); $.on($('.export', Settings.dialog), 'click', Settings["export"]); $.on($('.import', Settings.dialog), 'click', Settings["import"]); @@ -13526,12 +13530,14 @@ Conf['CachedTitles'] = []; $.get(Conf, function(items) { $.extend(Conf, items); - return Main.initFeatures(); + return $.asap((function() { + return doc = d.documentElement; + }), Main.initFeatures); }); return $.on(d, '4chanMainInit', Main.initStyle); }, initFeatures: function() { - var err, feature, name, video, _i, _len, _ref, _ref1; + var err, feature, name, onReady, _i, _len, _ref, _ref1; switch (location.hostname) { case 'a.4cdn.org': return; @@ -13539,20 +13545,8 @@ Report.init(); return; case 'i.4cdn.org': - if (Conf['Loop in New Tab'] && document.body && (video = $('video'))) { - Video.configure(video); - $.on(video, 'click', function() { - if (!video.controls) { - if (video.paused) { - return video.play(); - } else { - return video.pause(); - } - } - }); - } - $.ready(function() { - var URL, pathname, _ref; + onReady = function() { + var URL, pathname, video, _ref; if (Conf['404 Redirect'] && ((_ref = d.title) === '4chan - Temporarily Offline' || _ref === '4chan - 404 Not Found')) { Redirect.init(); pathname = location.pathname.split('/'); @@ -13563,8 +13557,20 @@ if (URL) { return location.replace(URL); } + } else if (Conf['Loop in New Tab'] && (video = $('video'))) { + Video.configure(video); + return $.on(video, 'click', function() { + if (!video.controls) { + if (video.paused) { + return video.play(); + } else { + return video.pause(); + } + } + }); } - }); + }; + $.ready(onReady, true); return; } _ref = Main.features; @@ -13710,7 +13716,7 @@ } if (previousversion) { el = $.el('span', { - innerHTML: '4chan X has been updated to version 1.7.41.' + innerHTML: '4chan X has been updated to version 1.7.42.' }); new Notice('info', el, 15); } else { diff --git a/builds/updates.xml b/builds/updates.xml index 8188e3574..2b24f79f8 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/package.json b/package.json index 1e4933034..150d2780d 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "4chan-X", - "version": "1.7.41", + "version": "1.7.42", "description": "Cross-browser userscript for maximum lurking on 4chan.", "meta": { "name": "4chan X",