Merge branch 'master' into QR

This commit is contained in:
Nicolas Stepien 2011-09-18 15:06:19 +02:00
commit ccbc3459cc
2 changed files with 3 additions and 3 deletions

View File

@ -2019,11 +2019,11 @@
return g.callbacks.push(Time.node);
},
node: function(root) {
var day, hour, min, month, node, time, year, _, _ref;
var day, hour, min, month, node, posttime, time, year, _, _ref;
if (root.className === 'inline') {
return;
}
node = root.className === 'op' ? $('.posttime', root) : $('span[id]', root).previousSibling;
node = (posttime = $('.posttime', root)) ? posttime : $('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;

View File

@ -1566,7 +1566,7 @@ Time =
g.callbacks.push Time.node
node: (root) ->
return if root.className is 'inline'
node = if root.className is 'op' then $('.posttime', root) else $('span[id]', root).previousSibling
node = if posttime = $('.posttime', root) then posttime else $('span[id]', root).previousSibling
[_, month, day, year, hour, min] =
node.textContent.match /(\d+)\/(\d+)\/(\d+)\(\w+\)(\d+):(\d+)/
year = "20#{year}"