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 2011-12-30 20:10:21 +01:00
commit 4d821dc210
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
4chan_x.user.js
View File

@ -1760,7 +1760,7 @@
input.disabled = true; input.disabled = true;
input.value = 404; input.value = 404;
} }
d.title = d.title.match(/.+-/)[0] + ' 404'; d.title = d.title.match(/^.+-/)[0] + ' 404';
g.dead = true; g.dead = true;
Favicon.update(); Favicon.update();
return; return;
@ -1773,7 +1773,6 @@
This saves bandwidth for both the user and the servers, avoid unnecessary computation, This saves bandwidth for both the user and the servers, avoid unnecessary computation,
and won't load images and scripts when parsing the response. and won't load images and scripts when parsing the response.
*/ */
updater.lastModified = this.getResponseHeader('Last-Modified');
if (this.status === 304) { if (this.status === 304) {
if (conf['Verbose']) { if (conf['Verbose']) {
updater.count.textContent = '+0'; updater.count.textContent = '+0';
@ -1781,6 +1780,7 @@
} }
return; return;
} }
updater.lastModified = this.getResponseHeader('Last-Modified');
body = $.el('body', { body = $.el('body', {
innerHTML: this.responseText innerHTML: this.responseText
}); });

5
script.coffee
View File

@ -1364,8 +1364,7 @@ updater =
for input in $$ '#com_submit' for input in $$ '#com_submit'
input.disabled = true input.disabled = true
input.value = 404 input.value = 404
# XXX trailing spaces are trimmed d.title = d.title.match(/^.+-/)[0] + ' 404'
d.title = d.title.match(/.+-/)[0] + ' 404'
g.dead = true g.dead = true
Favicon.update() Favicon.update()
return return
@ -1379,12 +1378,12 @@ updater =
This saves bandwidth for both the user and the servers, avoid unnecessary computation, This saves bandwidth for both the user and the servers, avoid unnecessary computation,
and won't load images and scripts when parsing the response. and won't load images and scripts when parsing the response.
### ###
updater.lastModified = @getResponseHeader('Last-Modified')
if @status is 304 if @status is 304
if conf['Verbose'] if conf['Verbose']
updater.count.textContent = '+0' updater.count.textContent = '+0'
updater.count.className = null updater.count.className = null
return return
updater.lastModified = @getResponseHeader 'Last-Modified'
body = $.el 'body', body = $.el 'body',
innerHTML: @responseText innerHTML: @responseText