diff --git a/source/Ox.UI/js/Calendar/Ox.Calendar.js b/source/Ox.UI/js/Calendar/Ox.Calendar.js index 2a9257f2..855d647f 100644 --- a/source/Ox.UI/js/Calendar/Ox.Calendar.js +++ b/source/Ox.UI/js/Calendar/Ox.Calendar.js @@ -85,7 +85,11 @@ Ox.Calendar = function(options, self) { id: 'millennium', seconds: 365242.5 * 86400, date: function(i) { - return new Date(Date.UTC((i + 1) * 1000, 0, 1)) + var date = new Date(); + date.setUTCFullYear((i + 1) * 1000); + date.setUTCMonth(0); + date.setUTCDate(0); + return date; }, name: function(i) { return i > -2 @@ -100,7 +104,11 @@ Ox.Calendar = function(options, self) { id: 'century', seconds: 36524.25 * 86400, date: function(i) { - return new Date(Date.UTC((i + 19) * 100, 0, 1)) + var date = new Date(); + date.setUTCFullYear((i + 19) * 100); + date.setUTCMonth(0); + date.setUTCDate(0); + return date; }, name: function(i) { return i > -20 @@ -115,7 +123,11 @@ Ox.Calendar = function(options, self) { id: 'decade', seconds: 3652.425 * 86400, date: function(i) { - return new Date(Date.UTC((i + 197) * 10, 0, 1)) + var date = new Date(); + date.setUTCFullYear((i + 197) * 10); + date.setUTCMonth(0); + date.setUTCDate(0); + return date; }, name: function(i) { return (i + 197) + '0s' @@ -128,7 +140,11 @@ Ox.Calendar = function(options, self) { id: 'year', seconds: 365.2425 * 86400, date: function(i) { - return new Date(Date.UTC(i + 1970, 0, 1)); + var date = new Date(); + date.setUTCFullYear(i + 1970); + date.setUTCMonth(0); + date.setUTCDate(0); + return date; }, name: function(i) { return (i + 1970) + ''; @@ -141,7 +157,14 @@ Ox.Calendar = function(options, self) { id: 'month', seconds: 365.2425 / 12 * 86400, date: function(i) { - return new Date(Date.UTC(Math.floor(i / 12) + 1970, Ox.mod(i, 12), 1)); + ///* + var date = new Date(); + date.setUTCFullYear(Math.floor(i / 12) + 1970); + date.setUTCMonth(Ox.mod(i, 12)); + date.setUTCDate(0); + return date; + //*/ + //return new Date(Date.UTC(Math.floor(i / 12) + 1970, Ox.mod(i, 12), 1)); }, name: function(i) { return Ox.SHORT_MONTHS[Ox.mod(i, 12)] + ' ' + Math.floor(i / 12 + 1970) @@ -558,7 +581,6 @@ Ox.Calendar = function(options, self) { var left = Math.max(getPosition(event.start, zoom), -10000), paddingLeft = (event.type && left < 0 ? -left : 0), width = Ox.limit(getPosition(event.end, zoom) - left, 1, 20000) - paddingLeft; - Ox.print('LEFT', left, 'WIDTH', width, 'P-LEFT', paddingLeft) return new Ox.Element() .addClass('OxEvent' + (event.type ? ' Ox' + Ox.toTitleCase(event.type) : '' ) + @@ -665,7 +687,7 @@ Ox.Calendar = function(options, self) { width = unit.seconds * getPixelsPerSecond(zoom), n = Math.ceil(self.options.width * 1.5/* * 16*/ / width); //Ox.print(zoom, getUnits(zoom).map(function(u) {return u.name(value)}).join('/')) - Ox.print('VALUE', value) + //Ox.print('VALUE', value) Ox.loop(-n, n + 1, function(i) { $elements.push( getEventElement({ @@ -685,7 +707,6 @@ Ox.Calendar = function(options, self) { // units[1] for background var pixelsPerSecond = getPixelsPerSecond(zoom), units; - Ox.print(zoom, 'ppsec', pixelsPerSecond) self.units.reverse(); Ox.forEach(self.units, function(v, i) { width = Math.round(v.seconds * pixelsPerSecond); @@ -749,7 +770,6 @@ Ox.Calendar = function(options, self) { } function panBy(ms) { - Ox.print('panBY', ms) panTo(new Date(+self.options.date + ms)); }