Merge from upstream

This commit is contained in:
Andrew Sliwinski 2014-04-10 12:25:43 -07:00
commit aade0b4121
3 changed files with 10 additions and 4 deletions
js/primitives

View file

@ -245,7 +245,7 @@ SensingPrims.prototype.primTimestamp = function(b) {
var epoch = new Date(2000, 0, 1);
var dst = now.getTimezoneOffset() - epoch.getTimezoneOffset();
var msSince = now.getTime() - epoch.getTime();
msSince += (now.getTimezoneOffset() - dst) * 60000;
msSince -= dst * 60000;
return msSince / 86400000;
};