Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into qr

Browse Source
This commit is contained in:
Nicolas Stepien 2012-01-28 19:59:11 +01:00
commit 962ad27222
5 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
4chan_x.user.js
View File

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan x // @name 4chan x
// @version 2.24.4 // @version 2.24.5
// @namespace aeosynth // @namespace aeosynth
// @description Adds various features. // @description Adds various features.
// @copyright 2009-2011 James Campos <james.r.campos@gmail.com> // @copyright 2009-2011 James Campos <james.r.campos@gmail.com>
@ -18,7 +18,7 @@
* Copyright (c) 2009-2011 James Campos <james.r.campos@gmail.com> * Copyright (c) 2009-2011 James Campos <james.r.campos@gmail.com>
* Copyright (c) 2012 Nicolas Stepien <stepien.nicolas@gmail.com> * Copyright (c) 2012 Nicolas Stepien <stepien.nicolas@gmail.com>
* http://mayhemydg.github.com/4chan-x/ * 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 * Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation * obtaining a copy of this software and associated documentation
@ -203,7 +203,7 @@
NAMESPACE = '4chan_x.'; NAMESPACE = '4chan_x.';
VERSION = '2.24.4'; VERSION = '2.24.5';
SECOND = 1000; SECOND = 1000;
@ -310,7 +310,7 @@
$.extend($, { $.extend($, {
ready: function(fc) { ready: function(fc) {
var cb; var cb;
if (/interactive|complete/.test(d.readyState)) return fc(); if (/interactive|complete/.test(d.readyState)) return setTimeout(fc);
cb = function() { cb = function() {
$.off(d, 'DOMContentLoaded', cb); $.off(d, 'DOMContentLoaded', cb);
return fc(); return fc();

2
Cakefile
View File

@ -2,7 +2,7 @@
{exec} = require 'child_process' {exec} = require 'child_process'
fs = require 'fs' fs = require 'fs'
VERSION = '2.24.4' VERSION = '2.24.5'
HEADER = """ HEADER = """
// ==UserScript== // ==UserScript==

5
changelog
View File

@ -1,6 +1,11 @@
master master
2.24.5
- Mayhem - Mayhem
Index Navigation and the See next/previous thread keybinds will not cycle through board pages anymore. 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 2.24.4
- ahokadesuka - ahokadesuka

2
latest.js
View File

@ -1 +1 @@
postMessage({version:'2.24.4'},'*'); postMessage({version:'2.24.5'},'*');

6
script.coffee
View File

@ -120,7 +120,7 @@ conf = {}
) null, config ) null, config
NAMESPACE = '4chan_x.' NAMESPACE = '4chan_x.'
VERSION = '2.24.4' VERSION = '2.24.5'
SECOND = 1000 SECOND = 1000
MINUTE = 60*SECOND MINUTE = 60*SECOND
HOUR = 60*MINUTE HOUR = 60*MINUTE
@ -222,7 +222,9 @@ $.extend = (object, properties) ->
$.extend $, $.extend $,
ready: (fc) -> ready: (fc) ->
if /interactive|complete/.test d.readyState 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 = -> cb = ->
$.off d, 'DOMContentLoaded', cb $.off d, 'DOMContentLoaded', cb
fc() fc()