From 87c1fcc0fd6e118c2e33ad5c11729ec84d78f900 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Sat, 28 Jan 2012 19:47:58 +0100 Subject: [PATCH 1/2] Fix $.ready for Opera as it loads userscripts on window.onload and not document-start. --- 4chan_x.user.js | 2 +- changelog | 1 + script.coffee | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index 18a06fa11..b458cf5a5 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -312,7 +312,7 @@ $.extend($, { ready: function(fc) { var cb; - if (/interactive|complete/.test(d.readyState)) return fc(); + if (/interactive|complete/.test(d.readyState)) return setTimeout(fc); cb = function() { $.off(d, 'DOMContentLoaded', cb); return fc(); diff --git a/changelog b/changelog index e71d58f30..5f56e4552 100644 --- a/changelog +++ b/changelog @@ -1,6 +1,7 @@ master - Mayhem Index Navigation and the See next/previous thread keybinds will not cycle through board pages anymore. + Fix archive redirection in Opera. 2.24.4 - ahokadesuka diff --git a/script.coffee b/script.coffee index 5f8dd3ccd..3eb398ebe 100644 --- a/script.coffee +++ b/script.coffee @@ -223,7 +223,9 @@ $.extend = (object, properties) -> $.extend $, ready: (fc) -> if /interactive|complete/.test d.readyState - return fc() + # Execute the functions in parallel. + # If one fails, do not stop the others. + return setTimeout fc cb = -> $.off d, 'DOMContentLoaded', cb fc() From 0dce1dd7a98a877cc06bc2b52fd6f25a8b41594c Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Sat, 28 Jan 2012 19:50:29 +0100 Subject: [PATCH 2/2] Release 2.24.5. Opera support on hold. --- 4chan_x.user.js | 6 +++--- Cakefile | 2 +- changelog | 4 ++++ latest.js | 2 +- script.coffee | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index b458cf5a5..821f2eab4 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan x -// @version 2.24.4 +// @version 2.24.5 // @namespace aeosynth // @description Adds various features. // @copyright 2009-2011 James Campos @@ -18,7 +18,7 @@ * Copyright (c) 2009-2011 James Campos * Copyright (c) 2012 Nicolas Stepien * http://mayhemydg.github.com/4chan-x/ - * 4chan X 2.24.4 + * 4chan X 2.24.5 * * Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation @@ -203,7 +203,7 @@ NAMESPACE = '4chan_x.'; - VERSION = '2.24.4'; + VERSION = '2.24.5'; SECOND = 1000; diff --git a/Cakefile b/Cakefile index 35575dfb0..140d5d3cb 100644 --- a/Cakefile +++ b/Cakefile @@ -2,7 +2,7 @@ {exec} = require 'child_process' fs = require 'fs' -VERSION = '2.24.4' +VERSION = '2.24.5' HEADER = """ // ==UserScript== diff --git a/changelog b/changelog index 5f56e4552..83fb8f7e9 100644 --- a/changelog +++ b/changelog @@ -1,7 +1,11 @@ master + +2.24.5 - Mayhem Index Navigation and the See next/previous thread keybinds will not cycle through board pages anymore. Fix archive redirection in Opera. + Opera support will now be temporarily on hold. + see https://github.com/MayhemYDG/4chan-x/issues/136 2.24.4 - ahokadesuka diff --git a/latest.js b/latest.js index 639387181..150273f8c 100644 --- a/latest.js +++ b/latest.js @@ -1 +1 @@ -postMessage({version:'2.24.4'},'*'); +postMessage({version:'2.24.5'},'*'); diff --git a/script.coffee b/script.coffee index 3eb398ebe..3fba9ad66 100644 --- a/script.coffee +++ b/script.coffee @@ -121,7 +121,7 @@ conf = {} ) null, config NAMESPACE = '4chan_x.' -VERSION = '2.24.4' +VERSION = '2.24.5' SECOND = 1000 MINUTE = 60*SECOND HOUR = 60*MINUTE