Merge branch 'master' into QR
This commit is contained in:
commit
f37d4c14fc
@ -2019,17 +2019,12 @@
|
||||
return g.callbacks.push(Time.node);
|
||||
},
|
||||
node: function(root) {
|
||||
var day, hour, min, month, node, tc, time, year, _, _ref;
|
||||
var day, hour, min, month, node, time, year, _, _ref;
|
||||
if (root.className === 'inline') {
|
||||
return;
|
||||
}
|
||||
node = $('span[id]', root).previousSibling;
|
||||
tc = node.textContent;
|
||||
if (tc === ' ') {
|
||||
node = node.previousSibling;
|
||||
tc = node.textContent;
|
||||
}
|
||||
_ref = tc.match(/(\d+)\/(\d+)\/(\d+)\(\w+\)(\d+):(\d+)/), _ = _ref[0], month = _ref[1], day = _ref[2], year = _ref[3], hour = _ref[4], min = _ref[5];
|
||||
node = root.className === 'op' ? $('.posttime', root) : $('span[id]', root).previousSibling;
|
||||
_ref = node.textContent.match(/(\d+)\/(\d+)\/(\d+)\(\w+\)(\d+):(\d+)/), _ = _ref[0], month = _ref[1], day = _ref[2], year = _ref[3], hour = _ref[4], min = _ref[5];
|
||||
year = "20" + year;
|
||||
month -= 1;
|
||||
hour = g.chanOffset + Number(hour);
|
||||
|
||||
@ -1566,13 +1566,9 @@ Time =
|
||||
g.callbacks.push Time.node
|
||||
node: (root) ->
|
||||
return if root.className is 'inline'
|
||||
node = $('span[id]', root).previousSibling
|
||||
tc = node.textContent
|
||||
if tc is ' '
|
||||
node = node.previousSibling
|
||||
tc = node.textContent
|
||||
node = if root.className is 'op' then $('.posttime', root) else $('span[id]', root).previousSibling
|
||||
[_, month, day, year, hour, min] =
|
||||
tc.match /(\d+)\/(\d+)\/(\d+)\(\w+\)(\d+):(\d+)/
|
||||
node.textContent.match /(\d+)\/(\d+)\/(\d+)\(\w+\)(\d+):(\d+)/
|
||||
year = "20#{year}"
|
||||
month -= 1 #months start at 0
|
||||
hour = g.chanOffset + Number hour
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user