Merge branch 'master' of github.com:aeosynth/4chan-x

This commit is contained in:
James Campos 2011-09-28 14:14:35 -07:00
commit d4f54f8bd7
2 changed files with 9 additions and 12 deletions

View File

@ -1790,9 +1790,7 @@
}; };
threading = { threading = {
init: function() { init: function() {
var node; return threading.thread($('body > form').firstChild);
node = $('form[name=delform] > *:not([id])');
return threading.thread(node);
}, },
op: function(node) { op: function(node) {
var op; var op;
@ -1805,7 +1803,7 @@
node = op.nextSibling; node = op.nextSibling;
} }
$.add(op, node); $.add(op, node);
op.id = $('input[name]', op).name; op.id = $('input', op).name;
return op; return op;
}, },
thread: function(node) { thread: function(node) {
@ -3039,7 +3037,7 @@
tzOffset = (new Date()).getTimezoneOffset() / 60; tzOffset = (new Date()).getTimezoneOffset() / 60;
g.chanOffset = 5 - tzOffset; g.chanOffset = 5 - tzOffset;
if ($.isDST()) { if ($.isDST()) {
g.chanOffset -= 1; g.chanOffset--;
} }
lastChecked = $.get('lastChecked', 0); lastChecked = $.get('lastChecked', 0);
now = Date.now(); now = Date.now();

View File

@ -1321,9 +1321,7 @@ QR =
threading = threading =
init: -> init: ->
# don't thread image controls threading.thread $('body > form').firstChild
node = $ 'form[name=delform] > *:not([id])'
threading.thread node
op: (node) -> op: (node) ->
op = $.el 'div', op = $.el 'div',
@ -1333,7 +1331,7 @@ threading =
$.add op, node $.add op, node
node = op.nextSibling node = op.nextSibling
$.add op, node #add the blockquote $.add op, node #add the blockquote
op.id = $('input[name]', op).name op.id = $('input', op).name
op op
thread: (node) -> thread: (node) ->
@ -1982,7 +1980,7 @@ unread =
Favicon = Favicon =
init: -> init: ->
favicon = $ 'link[rel="shortcut icon"]', d.head favicon = $ 'link[rel="shortcut icon"]', d.head
favicon.type = 'image/x-icon' favicon.type = 'image/x-icon'
{href} = favicon {href} = favicon
Favicon.default = href Favicon.default = href
@ -2253,8 +2251,9 @@ Main =
g.hiddenReplies = $.get "hiddenReplies/#{g.BOARD}/", {} g.hiddenReplies = $.get "hiddenReplies/#{g.BOARD}/", {}
tzOffset = (new Date()).getTimezoneOffset() / 60 tzOffset = (new Date()).getTimezoneOffset() / 60
# GMT -8 is given as +480; would GMT +8 be -480 ? # GMT -8 is given as +480; would GMT +8 be -480 ?
g.chanOffset = 5 - tzOffset# 4chan = EST = GMT -5 g.chanOffset = 5 - tzOffset
if $.isDST() then g.chanOffset -= 1 # 4chan = EST = GMT -5
g.chanOffset-- if $.isDST()
lastChecked = $.get 'lastChecked', 0 lastChecked = $.get 'lastChecked', 0
now = Date.now() now = Date.now()