Merge branch 'master' into qr
This commit is contained in:
commit
962ad27222
@ -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 <james.r.campos@gmail.com>
|
||||
@ -18,7 +18,7 @@
|
||||
* Copyright (c) 2009-2011 James Campos <james.r.campos@gmail.com>
|
||||
* Copyright (c) 2012 Nicolas Stepien <stepien.nicolas@gmail.com>
|
||||
* 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;
|
||||
|
||||
@ -310,7 +310,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();
|
||||
|
||||
2
Cakefile
2
Cakefile
@ -2,7 +2,7 @@
|
||||
{exec} = require 'child_process'
|
||||
fs = require 'fs'
|
||||
|
||||
VERSION = '2.24.4'
|
||||
VERSION = '2.24.5'
|
||||
|
||||
HEADER = """
|
||||
// ==UserScript==
|
||||
|
||||
@ -1,6 +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
|
||||
|
||||
@ -1 +1 @@
|
||||
postMessage({version:'2.24.4'},'*');
|
||||
postMessage({version:'2.24.5'},'*');
|
||||
|
||||
@ -120,7 +120,7 @@ conf = {}
|
||||
) null, config
|
||||
|
||||
NAMESPACE = '4chan_x.'
|
||||
VERSION = '2.24.4'
|
||||
VERSION = '2.24.5'
|
||||
SECOND = 1000
|
||||
MINUTE = 60*SECOND
|
||||
HOUR = 60*MINUTE
|
||||
@ -222,7 +222,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()
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user