Date: fix parsing of ISO8601 timezones (+HHMM worked, but +HH:MM and +HH added) (fix #2669)

Author: gfwilliams

ChangeLog

@@ -3,6 +3,7 @@
             STM32: Ensure setDeepSleep(1) will only sleep if there are no active PWM outputs
             Pin.getInfo().negated now set if pin negated in firmware
             Bangle.js: Add Bangle.setOptions({stepCounterDisabled:bool}) to disable the step counter
+            Date: fix parsing of ISO8601 timezones (+HHMM worked, but +HH:MM and +HH added) (fix #2669)
 
      2v28 : Add `E.internal` as a way to access the 'hidden root' containing Espruino internal variables that previously needed `global["\xff"]`
             Bangle.js: Fix back handler not removed when using E.setUI with a back button but without widgets (#2636)

src/jswrap_date.c

@@ -157,7 +157,6 @@ int jsdGetEffectiveTimeZone(JsVarFloat ms, bool is_local_time, bool *is_dst) {
 
 // this needs to be called just before a TimeInDay is used -- unless the TimeInDay timezone has been determined by other means.
 void setCorrectTimeZone(TimeInDay *td) {
-  td->zone = 0;
   td->zone = jsdGetEffectiveTimeZone(fromTimeInDay(td),true,&(td->is_dst));
 }
 
@@ -837,15 +836,25 @@ static bool _parse_time(TimeInDay *time, int initialChars) {
               setCorrectTimeZone(time);
             }
           }
-          if (lex->tk == '+' || lex->tk == '-') {
+          if (lex->tk == '+' || lex->tk == '-') { // Timezone: HH:MM, HHMM, HH
             int sign = lex->tk == '+' ? 1 : -1;
             jslGetNextToken();
             if (lex->tk == LEX_INT) {
               int i = _parse_int();
-              // correct the fact that it's HHMM and turn it into just minutes
-              i = (i%100) + ((i/100)*60);
-              time->zone = i*sign;
+              int tzLength = jslGetTokenLength();
+              if (tzLength==4) {
+                // correct the fact that it's HHMM and turn it into just minutes
+                i = (i%100) + ((i/100)*60);
+              } else
+                i *= 60; // length = 2 => hours
               jslGetNextToken();
+              if (tzLength==2 && lex->tk == ':') {
+                jslGetNextToken();
+                if (lex->tk == LEX_INT) {
+                  i += _parse_int();
+                }
+              }
+              time->zone = i*sign;
             } else {
               setCorrectTimeZone(time);
             }