Merge branch 'master' of github.com:andrewplummer/Sugar

dbravender · Oct 17, 2012 · ddac06a · ddac06a
2 parents 8239502 + 86f1b34
commit ddac06a
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 22 deletions.
diff --git a/component.json b/component.json
@@ -0,0 +1,6 @@
+{
+  "name": "sugar",
+  "version": "1.3.5",
+  "main": "./release/1.3.5/sugar-1.3.5.min.js",
+  "dependencies": {}
+}
diff --git a/lib/date.js b/lib/date.js
@@ -11,7 +11,7 @@
 
   var TimeFormat = ['ampm','hour','minute','second','ampm','utc','offset_sign','offset_hours','offset_minutes','ampm']
   var DecimalReg = '(?:[,.]\\d+)?';
-  var HoursReg   = '2[0-4]|[01]?\\d' + DecimalReg;
+  var HoursReg   = '\\d{1,2}' + DecimalReg;
   var SixtyReg   = '[0-5]\\d' + DecimalReg;
   var RequiredTime = '({t})?\\s*('+HoursReg+')(?:{h}('+SixtyReg+')?{m}(?::?('+SixtyReg+'){s})?\\s*(?:({t})|(Z)|(?:([+-])(\\d{2,2})(?::?(\\d{2,2}))?)?)?|\\s*({t}))';
 
@@ -1032,7 +1032,9 @@
   // (or 29th in the case of a leap year).
 
   function checkMonthTraversal(date, targetMonth) {
-    if(targetMonth < 0) targetMonth += 12;
+    if(targetMonth < 0) {
+      targetMonth = targetMonth % 12 + 12;
+    }
     if(targetMonth % 12 != callDateGet(date, 'Month')) {
       callDateSet(date, 'Date', 0);
     }

diff --git a/release/edge/precompiled/development/date.js b/release/edge/precompiled/development/date.js
@@ -11,7 +11,7 @@
 
   var TimeFormat = ['ampm','hour','minute','second','ampm','utc','offset_sign','offset_hours','offset_minutes','ampm']
   var DecimalReg = '(?:[,.]\\d+)?';
-  var HoursReg   = '2[0-4]|[01]?\\d' + DecimalReg;
+  var HoursReg   = '\\d{1,2}' + DecimalReg;
   var SixtyReg   = '[0-5]\\d' + DecimalReg;
   var RequiredTime = '({t})?\\s*('+HoursReg+')(?:{h}('+SixtyReg+')?{m}(?::?('+SixtyReg+'){s})?\\s*(?:({t})|(Z)|(?:([+-])(\\d{2,2})(?::?(\\d{2,2}))?)?)?|\\s*({t}))';
 
@@ -1032,7 +1032,9 @@
   // (or 29th in the case of a leap year).
 
   function checkMonthTraversal(date, targetMonth) {
-    if(targetMonth < 0) targetMonth += 12;
+    if(targetMonth < 0) {
+      targetMonth = targetMonth % 12 + 12;
+    }
     if(targetMonth % 12 != callDateGet(date, 'Month')) {
       callDateSet(date, 'Date', 0);
     }

diff --git a/release/edge/precompiled/minified/date.js b/release/edge/precompiled/minified/date.js
diff --git a/release/edge/sugar-edge-full.development.js b/release/edge/sugar-edge-full.development.js
@@ -2048,7 +2048,7 @@
 
   var TimeFormat = ['ampm','hour','minute','second','ampm','utc','offset_sign','offset_hours','offset_minutes','ampm']
   var DecimalReg = '(?:[,.]\\d+)?';
-  var HoursReg   = '2[0-4]|[01]?\\d' + DecimalReg;
+  var HoursReg   = '\\d{1,2}' + DecimalReg;
   var SixtyReg   = '[0-5]\\d' + DecimalReg;
   var RequiredTime = '({t})?\\s*('+HoursReg+')(?:{h}('+SixtyReg+')?{m}(?::?('+SixtyReg+'){s})?\\s*(?:({t})|(Z)|(?:([+-])(\\d{2,2})(?::?(\\d{2,2}))?)?)?|\\s*({t}))';
 
@@ -3069,7 +3069,9 @@
   // (or 29th in the case of a leap year).
 
   function checkMonthTraversal(date, targetMonth) {
-    if(targetMonth < 0) targetMonth += 12;
+    if(targetMonth < 0) {
+      targetMonth = targetMonth % 12 + 12;
+    }
     if(targetMonth % 12 != callDateGet(date, 'Month')) {
       callDateSet(date, 'Date', 0);
     }