Bugfix click token logic

Author: mschnee

index.html

@@ -15,7 +15,8 @@
 <br/>
 <ul>
 <li>All of the strftime() tokens are supported for formatting.</li>
-<li>All of the strftime() tokens are supported for user-interaction except for %z and %Z, for two reasons:.  <ul><li>Changing the zone doesn't affect the time at all (an internal timestamp), only the display of the time.</li><li>Changing zones and the zone display properly requires having access to the proper tz_data, up-to-date DST boundary tules for the zone.  Date() doesn't know about any of this- it exists in your system's locale only, and depending on your locale, your time zone changes depending on the selected time and date.  That data can ALSO change over time.  Date() doesn't know anything about that.</li><li>There is no workaround in Javascript for the DST-boundary locale problem without including the entire tz database and creating a custom Date() object (beyond the scope of this plugin) or W3C changing the spec for the Date() object and browsers to change locale in the browser window on-the-fly.</li><li><b>Note</b>: these problems are why most web programmers cheap out and put up the three Select boxes for choosing a date.</li></ul></li>
+<li>All of the strftime() tokens are supported for user-interaction except for %z and %Z, for two reasons:.  <ul><li>Changing the zone doesn't affect the time at all (an internal timestamp), only the display of the time.</li><li>Changing zones and the zone display properly requires having access to the proper tz_data, up-to-date DST boundary tules for the zone.  Date() doesn't know about any of this- it exists in your system's locale only, and depending on your locale, your time zone changes depending on the selected time and date.  That data can ALSO change over time.  Date() doesn't know anything about that.</li><li>There is no workaround in Javascript for the DST-boundary locale problem without including the entire tz database and creating a custom Date() object (beyond the scope of this plugin) or W3C changing the spec for the Date() object and browsers to change locale in the browser window on-the-fly.</li><li><b>Note</b>: these problems are why most web programmers cheap out and put up the three Select 
+boxes for choosing a date.</li></ul></li>
 <li>Tokens in the format of exclaimation-character instead of percent-character are <b>non-interactive replacements</b>.  These are tokens that will be replaced according to strftime() rules, but the user won't be able to interact with them.</li>
 <li>The input on this page is currently configuredas such: <b>Tab</b> advances tokens in an input, and after the last interactive token will advance to the next focusable input. <b>Enter</b> advances to the next focusable object (like tab normally does).</li>
 </ul>
@@ -32,7 +33,7 @@
 var tests = [
     [, {displayFormat:"%m/%d/%y %I:%M %p"}],
     ["1330322400000",{displayFormat:"%m/%d/%y %I:%M %p"}],
-    ["1330322400000",{displayFormat:"%c",autoResize:true}],
+    ["1330322400000",{displayFormat:"!c",autoResize:true}],
     ["1330322400000",{displayFormat:"%m/!d/%Y"}],
     ["2/27/2012 03:00 PM",{displayFormat:"%m/%d/%y %I:%M %p"}]
 ];

jquery.timeInput.js

@@ -965,6 +965,8 @@ function strtodate (str, now) {
         for(var i=0; i<currentToken;i++) {
             currentCharIndex+=(data.tokens[i].r?utcdate("%"+data.tokens[i].v,data.ds,data.timezoneOffset).trim():data.tokens[i].v).length
         }
+        if(currentToken <0 || currentToken >= data.tokens.length)
+            return false;
         var tokenValue = data.tokens[i].v;
         var endCharIndex = currentCharIndex+(data.tokens[currentToken].r?utcdate("%"+data.tokens[currentToken].v,data.ds,data.timezoneOffset).trim():data.tokens[currentToken].v).length;
         setTimeout(function(){selectRange(data.element,currentCharIndex,endCharIndex)},0);
@@ -977,10 +979,15 @@ function strtodate (str, now) {
         var data = Self.data('timeInput');
 
         /* first, increment to the first VALID interactive token */
-        while( currentTokenIndex < data.tokens.length && !data.tokens[currentTokenIndex].i) {
+        while( currentTokenIndex < data.tokens.length && !(data.tokens[currentTokenIndex].i)) {
             currentCharIndex+=(data.tokens[currentTokenIndex].r?utcdate("%"+data.tokens[currentTokenIndex].v,data.ds,data.timezoneOffset).trim():data.tokens[currentTokenIndex].v).length;
             currentTokenIndex++;                
         }
+        if(currentTokenIndex <0 || currentTokenIndex >= data.tokens.length) {
+            // if nothing is selectable.
+            return -1;
+        }
+        
         // move the index to the end of the token
         currentCharIndex+=(data.tokens[currentTokenIndex].r?utcdate("%"+data.tokens[currentTokenIndex].v,data.ds,data.timezoneOffset).trim():data.tokens[currentTokenIndex].v).length;
 
@@ -1000,7 +1007,6 @@ function strtodate (str, now) {
         }
         if(currentTokenIndex >= data.tokens.length)
             currentTokenIndex=data.tokens.length-1;
-        
         return currentTokenIndex;
     }
 
@@ -1159,6 +1165,12 @@ function strtodate (str, now) {
                             return (f === 'locale' ? _lc_time[m1] : f);
                         });
                     }
+                    while (settings.displayFormat.match(/![cDFhnrRtTxX]/)) {
+                        settings.displayFormat = settings.displayFormat.replace(/!([cDFhnrRtTxX])/g, function (m0, m1) {
+                            var f = _aggregates[m1];
+                            return (f === 'locale' ? _lc_time[m1] : f).replace(/%/g,'!');
+                        });
+                    }
 
                     /**
                     * The tokens are made up ov objects: