Merge branch 'master' of github.com:aeosynth/4chan-x
This commit is contained in:
commit
3a20baadfb
@ -1362,10 +1362,11 @@
|
|||||||
$.bind($('#dummy', qr.el), 'keydown', qr.captchaKeydown);
|
$.bind($('#dummy', qr.el), 'keydown', qr.captchaKeydown);
|
||||||
return $.add(d.body, qr.el);
|
return $.add(d.body, qr.el);
|
||||||
},
|
},
|
||||||
message: function(data) {
|
message: function(e) {
|
||||||
var duration, fileCount;
|
var data, duration, fileCount;
|
||||||
$('iframe[name=iframe]').src = 'about:blank';
|
$('iframe[name=iframe]').src = 'about:blank';
|
||||||
fileCount = $('#files', qr.el).childElementCount;
|
fileCount = $('#files', qr.el).childElementCount;
|
||||||
|
data = e.data;
|
||||||
if (data) {
|
if (data) {
|
||||||
data = JSON.parse(data);
|
data = JSON.parse(data);
|
||||||
$.extend($('#error', qr.el), data);
|
$.extend($('#error', qr.el), data);
|
||||||
@ -3007,8 +3008,8 @@
|
|||||||
if (origin === 'http://sys.4chan.org') {
|
if (origin === 'http://sys.4chan.org') {
|
||||||
return qr.message(data);
|
return qr.message(data);
|
||||||
} else {
|
} else {
|
||||||
if (data !== VERSION) {
|
if (data !== VERSION && confirm('a newer version of 4chan x is available, would you like to install it now?')) {
|
||||||
return alert('new version of 4chan x available on github!');
|
return window.location = 'https://github.com/aeosynth/4chan-x/raw/stable/4chan_x.user.js';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@ -2,6 +2,8 @@ master
|
|||||||
- mayhem
|
- mayhem
|
||||||
do not display inlined quotes within the quote preview
|
do not display inlined quotes within the quote preview
|
||||||
fix cross threads quotes in expanded threads or inlined cross quotes
|
fix cross threads quotes in expanded threads or inlined cross quotes
|
||||||
|
- aeosynth
|
||||||
|
script auto updating
|
||||||
|
|
||||||
2.19.3
|
2.19.3
|
||||||
- mayhem
|
- mayhem
|
||||||
|
|||||||
@ -1081,10 +1081,11 @@ qr =
|
|||||||
|
|
||||||
$.add d.body, qr.el
|
$.add d.body, qr.el
|
||||||
|
|
||||||
message: (data) ->
|
message: (e) ->
|
||||||
$('iframe[name=iframe]').src = 'about:blank'
|
$('iframe[name=iframe]').src = 'about:blank'
|
||||||
fileCount = $('#files', qr.el).childElementCount
|
fileCount = $('#files', qr.el).childElementCount
|
||||||
|
|
||||||
|
{data} = e
|
||||||
if data # error message
|
if data # error message
|
||||||
data = JSON.parse data
|
data = JSON.parse data
|
||||||
$.extend $('#error', qr.el), data
|
$.extend $('#error', qr.el), data
|
||||||
@ -2357,8 +2358,8 @@ Main =
|
|||||||
if origin is 'http://sys.4chan.org'
|
if origin is 'http://sys.4chan.org'
|
||||||
qr.message data
|
qr.message data
|
||||||
else
|
else
|
||||||
if data isnt VERSION
|
if data isnt VERSION and confirm 'a newer version of 4chan x is available, would you like to install it now?'
|
||||||
alert 'new version of 4chan x available on github!'
|
window.location = 'https://github.com/aeosynth/4chan-x/raw/stable/4chan_x.user.js'
|
||||||
|
|
||||||
css: '
|
css: '
|
||||||
/* dialog styling */
|
/* dialog styling */
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user