fix #1

kissyteam · Nov 27, 2014 · 7ebcb9d · 7ebcb9d
1 parent e45b3a1
commit 7ebcb9d
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 15 deletions.
diff --git a/build/gregorian-calendar-debug.js b/build/gregorian-calendar-debug.js
@@ -1,7 +1,7 @@
 /*
-Copyright 2014, gregorian-calendar@1.0.4
+Copyright 2014, gregorian-calendar@1.0.5
 MIT Licensed
-build time: Thu, 16 Oct 2014 06:56:35 GMT
+build time: Thu, 27 Nov 2014 07:30:03 GMT
 */
 modulex.add("gregorian-calendar", ["i18n!gregorian-calendar"], function(require, exports, module) {
 var i18nGregorianCalendar = require("i18n!gregorian-calendar");
@@ -176,7 +176,10 @@ gregorianCalendar = function (exports) {
     this.locale = locale;
     this.fields = [];
     this.time = undefined;
-    this.timezoneOffset = timezoneOffset || locale.timezoneOffset;
+    if (typeof timezoneOffset !== 'number') {
+      timezoneOffset = locale.timezoneOffset;
+    }
+    this.timezoneOffset = timezoneOffset;
     this.firstDayOfWeek = locale.firstDayOfWeek;
     this.minimalDaysInFirstWeek = locale.minimalDaysInFirstWeek;
     this.fieldsComputed = false;
@@ -769,7 +772,7 @@ gregorianCalendar = function (exports) {
     return fixedDate - mod(fixedDate - dayOfWeek, 7);
   }
   exports = GregorianCalendar;
-  GregorianCalendar.version = '1.0.4';
+  GregorianCalendar.version = '1.0.5';
   GregorianCalendar.locales = { 'default': defaultLocale };
   return exports;
 }();

diff --git a/build/gregorian-calendar-deps.js b/build/gregorian-calendar-deps.js
@@ -1,6 +1,6 @@
 /*
-Copyright 2014, gregorian-calendar@1.0.4
+Copyright 2014, gregorian-calendar@1.0.5
 MIT Licensed
-build time: Thu, 16 Oct 2014 06:56:35 GMT
+build time: Thu, 27 Nov 2014 07:30:03 GMT
 */
 modulex.config("requires",{"gregorian-calendar":["i18n!gregorian-calendar"]});
diff --git a/build/gregorian-calendar-deps.json b/build/gregorian-calendar-deps.json
@@ -1,6 +1,6 @@
 /*
-Copyright 2014, gregorian-calendar@1.0.4
+Copyright 2014, gregorian-calendar@1.0.5
 MIT Licensed
-build time: Thu, 16 Oct 2014 06:56:35 GMT
+build time: Thu, 27 Nov 2014 07:30:03 GMT
 */
 {"gregorian-calendar":["i18n!gregorian-calendar"]}
diff --git a/build/gregorian-calendar.js b/build/gregorian-calendar.js
diff --git a/build/gregorian-calendar/i18n/en-us-debug.js b/build/gregorian-calendar/i18n/en-us-debug.js
@@ -1,7 +1,7 @@
 /*
-Copyright 2014, gregorian-calendar@1.0.4
+Copyright 2014, gregorian-calendar@1.0.5
 MIT Licensed
-build time: Thu, 16 Oct 2014 06:56:35 GMT
+build time: Thu, 27 Nov 2014 07:30:03 GMT
 */
 modulex.add("gregorian-calendar/i18n/en-us",[], function(require, exports, module) {/**
  * locale info for KISSY Date

diff --git a/build/gregorian-calendar/i18n/zh-cn-debug.js b/build/gregorian-calendar/i18n/zh-cn-debug.js
@@ -1,7 +1,7 @@
 /*
-Copyright 2014, gregorian-calendar@1.0.4
+Copyright 2014, gregorian-calendar@1.0.5
 MIT Licensed
-build time: Thu, 16 Oct 2014 06:56:35 GMT
+build time: Thu, 27 Nov 2014 07:30:03 GMT
 */
 modulex.add("gregorian-calendar/i18n/zh-cn",[], function(require, exports, module) {/**
  * locale info for KISSY Date

diff --git a/lib/gregorian-calendar.js b/lib/gregorian-calendar.js
@@ -72,7 +72,11 @@ function GregorianCalendar(timezoneOffset, locale) {
      * @type Number
      * @protected
      */
-    this.timezoneOffset = timezoneOffset || locale.timezoneOffset;
+    if (typeof timezoneOffset !== 'number') {
+        timezoneOffset = locale.timezoneOffset;
+    }
+    this.timezoneOffset = timezoneOffset;
+
     /**
      * The first day of the week
      * @type Number

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gregorian-calendar",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "author": "yiminghe <yiminghe@gmail.com>",
   "engines": {
     "node": "~0.11"