Bugfix

strftime.js

@@ -11,351 +11,351 @@
 
 ;
 (function () {
-    // Where to export the API
+// Where to export the API
-    var namespace;
+var namespace;
-    var toString = Object.prototype.toString;
+var toString = Object.prototype.toString;
 
-    try {
+try {
-        // CommonJS / Node module
+    // CommonJS / Node module
-        namespace = module.exports = strftime;
+    namespace = module.exports = strftime;
-    } catch (error) {
+} catch (error) {
-        // Browsers and other environments
+    // Browsers and other environments
-        // Get the global object. Works in ES3, ES5, and ES5 strict mode.
+    // Get the global object. Works in ES3, ES5, and ES5 strict mode.
-        namespace = new Function('return this')();
+    namespace = new Function('return this')();
+}
+
+var DefaultLocale = {
+    days: 'Sunday Monday Tuesday Wednesday Thursday Friday Saturday'.split(' '),
+    shortDays: 'Sun Mon Tue Wed Thu Fri Sat'.split(' '),
+    months: 'January February March April May June July August September October November December'.split(' '),
+    shortMonths: 'Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec'.split(' '),
+    AM: 'AM',
+    PM: 'PM',
+    am: 'am',
+    pm: 'pm'
+};
+
+// d, locale, and options are optional, but you can't leave
+// holes in the argument list. If you pass options you have to pass
+// in all the preceding args as well.
+//
+// options:
+//   - locale   [object] an object with the same structure as DefaultLocale
+//   - timezone [number] timezone offset in minutes from GMT
+function _strftime(format, date, locale, options) {
+    var o = options || {};
+    var l = locale;
+    var d = date;
+    var m, ts, i = 0, r = '';
+    var re = /%([-_0]?)(.)/g;
+
+    if (d && !isDate(d)) {
+        l = d;
+        d = null;
     }
 
-    var DefaultLocale = {
+    l = l || DefaultLocale;
-        days: 'Sunday Monday Tuesday Wednesday Thursday Friday Saturday'.split(' '),
+    l.formats = l.formats || {};
-        shortDays: 'Sun Mon Tue Wed Thu Fri Sat'.split(' '),
+    d = d || new Date();
-        months: 'January February March April May June July August September October November December'.split(' '),
+    ts = d.getTime();
-        shortMonths: 'Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec'.split(' '),
+    d = fixTZ(d, o);
-        AM: 'AM',
-        PM: 'PM',
-        am: 'am',
-        pm: 'pm'
-    };
 
-    // d, locale, and options are optional, but you can't leave
+    while (m = re.exec(format)) {
-    // holes in the argument list. If you pass options you have to pass
+        r += format.substring(i, m.index) + match(m, d, l, ts, o);
-    // in all the preceding args as well.
+        i = m.index + m[0].length;
-    //
-    // options:
-    //   - locale   [object] an object with the same structure as DefaultLocale
-    //   - timezone [number] timezone offset in minutes from GMT
-    function _strftime(format, date, locale, options) {
-        var o = options || {};
-        var l = locale;
-        var d = date;
-        var m, ts, i = 0, r = '';
-        var re = /%([-_0]?)(.)/g;
-
-        if (d && !isDate(d)) {
-            l = d;
-            d = null;
-        }
-
-        l = l || DefaultLocale;
-        l.formats = l.formats || {};
-        d = d || new Date();
-        ts = d.getTime();
-        d = fixTZ(d, o);
-
-        while (m = re.exec(format)) {
-            r += format.substring(i, m.index) + match(m, d, l, ts, o);
-            i = m.index + m[0].length;
-        }
-
-        return r;
     }
 
-    var mask = {
+    return r + format.substring(i);
-        'A': function (padding, date, locale) {
+}
-            return locale.days[date.getDay()];
-        },
-        'a': function (padding, date, locale) {
-            return locale.shortDays[date.getDay()];
-        },
-        'B': function (padding, date, locale) {
-            return locale.months[date.getMonth()];
-        },
-        'b': function (padding, date, locale) {
-            return locale.shortMonths[date.getMonth()];
-        },
-        'C': function (padding, date) {
-            return pad(Math.floor(date.getFullYear() / 100), padding);
-        },
-        'D': function (padding, date, locale) {
-            return _strftime(locale.formats.D || '%m/%d/%y', date, locale);
-        },
-        'd': function (padding, date) {
-            return pad(date.getDate(), padding);
-        },
-        'e': function (padding, date) {
-            return date.getDate();
-        },
-        'F': function (padding, date, locale) {
-            return _strftime(locale.formats.F || '%Y-%m-%d', date, locale);
-        },
-        'H': function (padding, date) {
-            return pad(date.getHours(), padding);
-        },
-        'h': function (padding, date, locale) {
-            return locale.shortMonths[date.getMonth()];
-        },
-        'I': function (padding, date) {
-            return pad(hours12(date), padding);
-        },
-        'j': function (padding, date) {
-            var y = new Date(date.getFullYear(), 0, 1);
-            var day = Math.ceil((date.getTime() - y.getTime()) / (1000 * 60 * 60 * 24));
-            return pad(day, null, 3);
-        },
-        'k': function (padding, date) {
-            return pad(date.getHours(), padding == null ? ' ' : padding);
-        },
-        'L': function (padding, date, locale, timestamp) {
-            return pad(Math.floor(timestamp % 1000), null, 3);
-        },
-        'l': function (padding, date) {
-            return pad(hours12(date), padding == null ? ' ' : padding);
-        },
-        'M': function (padding, date) {
-            return pad(date.getMinutes(), padding);
-        },
-        'm': function (padding, date) {
-            return pad(date.getMonth() + 1, padding);
-        },
-        'n': function () {
-            return '\n';
-        },
-        'o': function (padding, date) {
-            var _date = date.getDate();
-            return String(_date) + ordinal(_date);
-        },
-        'P': function (padding, date, locale) {
-            return date.getHours() < 12 ? locale.am : locale.pm;
-        },
-        'p': function (padding, date, locale) {
-            return date.getHours() < 12 ? locale.AM : locale.PM;
-        },
-        'R': function (padding, date, locale) {
-            return _strftime(locale.formats.R || '%H:%M', date, locale);
-        },
-        'r': function (padding, date, locale) {
-            return _strftime(locale.formats.r || '%I:%M:%S %p', date, locale);
-        },
-        'S': function (padding, date) {
-            return pad(date.getSeconds(), padding);
-        },
-        's': function (padding, date, locale, timestamp) {
-            return Math.floor(timestamp / 1000);
-        },
-        'T': function (padding, date, locale) {
-            return _strftime(locale.formats.T || '%H:%M:%S', date, locale);
-        },
-        't': function () {
-            return '\t';
-        },
-        'U': function (padding, date) {
-            return pad(weekNumber(date, 'sunday'), padding);
-        },
-        'u': function (padding, date) {
-            var day = date.getDay();
-            return day === 0 ? 7 : day;
-        },
-        'v': function (padding, date, locale) {
-            return _strftime(locale.formats.v || '%e-%b-%Y', date, locale);
-        },
-        'W': function (padding, date) {
-            return pad(weekNumber(date, 'monday'), padding);
-        },
-        'w': function (padding, date) {
-            return date.getDay();
-        },
-        'Y': function (padding, date) {
-            return date.getFullYear();
-        },
-        'y': function (padding, date) {
-            return String(date.getFullYear()).slice(-2);
-        },
-        'Z': function (padding, date, locale, timestamp, options) {
-            if (options.utc) {
-                return 'GMT';
-            } else {
-                var tzString = date.toString().match(/\((\w+)\)/);
-                return tzString && tzString[1] || '';
-            }
-        },
-        'z': function (padding, date, locale, timestamp, options) {
-            if (options.utc) {
-                return '+0000';
-            } else {
-                var off = typeof options.timezone === 'number' ? options.timezone : -date.getTimezoneOffset();
-                return (off < 0 ? '-' : '+') + pad(Math.abs(off / 60)) + pad(off % 60);
-            }
-        }
-    };
 
-    // Most of the specifiers supported by C's strftime, and some from Ruby.
+var mask = {
-    // Some other syntax extensions from Ruby are supported: %-, %_, and %0
+    'A': function (padding, date, locale) {
-    // to pad with nothing, space, or zero (respectively).
+        return locale.days[date.getDay()];
-    function match(match, date, locale, timestamp, options) {
+    },
-        var p = match[1];
+    'a': function (padding, date, locale) {
-        var c = match[2];
+        return locale.shortDays[date.getDay()];
-
+    },
-        if (p) {
+    'B': function (padding, date, locale) {
-            switch (p) {
+        return locale.months[date.getMonth()];
-                case '-':
+    },
-                    p = '';
+    'b': function (padding, date, locale) {
-                    break;
+        return locale.shortMonths[date.getMonth()];
-                case '_':
+    },
-                    p = ' ';
+    'C': function (padding, date) {
-                    break;
+        return pad(Math.floor(date.getFullYear() / 100), padding);
-                case '0':
+    },
-                    break;
+    'D': function (padding, date, locale) {
-                default:
+        return _strftime(locale.formats.D || '%m/%d/%y', date, locale);
-                    return match[0];
+    },
-            }
+    'd': function (padding, date) {
+        return pad(date.getDate(), padding);
+    },
+    'e': function (padding, date) {
+        return date.getDate();
+    },
+    'F': function (padding, date, locale) {
+        return _strftime(locale.formats.F || '%Y-%m-%d', date, locale);
+    },
+    'H': function (padding, date) {
+        return pad(date.getHours(), padding);
+    },
+    'h': function (padding, date, locale) {
+        return locale.shortMonths[date.getMonth()];
+    },
+    'I': function (padding, date) {
+        return pad(hours12(date), padding);
+    },
+    'j': function (padding, date) {
+        var y = new Date(date.getFullYear(), 0, 1);
+        var day = Math.ceil((date.getTime() - y.getTime()) / (1000 * 60 * 60 * 24));
+        return pad(day, null, 3);
+    },
+    'k': function (padding, date) {
+        return pad(date.getHours(), padding == null ? ' ' : padding);
+    },
+    'L': function (padding, date, locale, timestamp) {
+        return pad(Math.floor(timestamp % 1000), null, 3);
+    },
+    'l': function (padding, date) {
+        return pad(hours12(date), padding == null ? ' ' : padding);
+    },
+    'M': function (padding, date) {
+        return pad(date.getMinutes(), padding);
+    },
+    'm': function (padding, date) {
+        return pad(date.getMonth() + 1, padding);
+    },
+    'n': function () {
+        return '\n';
+    },
+    'o': function (padding, date) {
+        var _date = date.getDate();
+        return String(_date) + ordinal(_date);
+    },
+    'P': function (padding, date, locale) {
+        return date.getHours() < 12 ? locale.am : locale.pm;
+    },
+    'p': function (padding, date, locale) {
+        return date.getHours() < 12 ? locale.AM : locale.PM;
+    },
+    'R': function (padding, date, locale) {
+        return _strftime(locale.formats.R || '%H:%M', date, locale);
+    },
+    'r': function (padding, date, locale) {
+        return _strftime(locale.formats.r || '%I:%M:%S %p', date, locale);
+    },
+    'S': function (padding, date) {
+        return pad(date.getSeconds(), padding);
+    },
+    's': function (padding, date, locale, timestamp) {
+        return Math.floor(timestamp / 1000);
+    },
+    'T': function (padding, date, locale) {
+        return _strftime(locale.formats.T || '%H:%M:%S', date, locale);
+    },
+    't': function () {
+        return '\t';
+    },
+    'U': function (padding, date) {
+        return pad(weekNumber(date, 'sunday'), padding);
+    },
+    'u': function (padding, date) {
+        var day = date.getDay();
+        return day === 0 ? 7 : day;
+    },
+    'v': function (padding, date, locale) {
+        return _strftime(locale.formats.v || '%e-%b-%Y', date, locale);
+    },
+    'W': function (padding, date) {
+        return pad(weekNumber(date, 'monday'), padding);
+    },
+    'w': function (padding, date) {
+        return date.getDay();
+    },
+    'Y': function (padding, date) {
+        return date.getFullYear();
+    },
+    'y': function (padding, date) {
+        return String(date.getFullYear()).slice(-2);
+    },
+    'Z': function (padding, date, locale, timestamp, options) {
+        if (options.utc) {
+            return 'GMT';
         } else {
-            p = null;
+            var tzString = date.toString().match(/\((\w+)\)/);
+            return tzString && tzString[1] || '';
         }
+    },
+    'z': function (padding, date, locale, timestamp, options) {
+        if (options.utc) {
+            return '+0000';
+        } else {
+            var off = typeof options.timezone === 'number' ? options.timezone : -date.getTimezoneOffset();
+            return (off < 0 ? '-' : '+') + pad(Math.abs(off / 60)) + pad(off % 60);
+        }
+    }
+};
 
-        return mask[c] ? mask[c](p, date, locale, timestamp, options) : c;
+// Most of the specifiers supported by C's strftime, and some from Ruby.
+// Some other syntax extensions from Ruby are supported: %-, %_, and %0
+// to pad with nothing, space, or zero (respectively).
+function match(match, date, locale, timestamp, options) {
+    var p = match[1];
+    var c = match[2];
+
+    if (p) {
+        switch (p) {
+            case '-':
+                p = '';
+                break;
+            case '_':
+                p = ' ';
+                break;
+            case '0':
+                break;
+            default:
+                return match[0];
+        }
+    } else {
+        p = null;
     }
 
-    function dateToUTC(d) {
+    return mask[c] ? mask[c](p, date, locale, timestamp, options) : c;
-        return new Date(d.getTime() + (d.getTimezoneOffset() || 0) * 60000);
+}
-    }
 
-    // Default padding is '0' and default length is 2, both are optional.
+function dateToUTC(d) {
-    function pad(n, padding, length) {
+    return new Date(d.getTime() + (d.getTimezoneOffset() || 0) * 60000);
-        var _n = String(n);
+}
-        var _p = padding == null ? '0' : padding;
-        var _l = length || 2;
 
-        // padding may be an empty string, don't loop forever if it is
+// Default padding is '0' and default length is 2, both are optional.
-        if (_p) {
+function pad(n, padding, length) {
-            while (_n.length < _l) {
+    var _n = String(n);
-                _n = _p + _n;
+    var _p = padding == null ? '0' : padding;
-            }
+    var _l = length || 2;
-        }
 
-        return _n;
+    // padding may be an empty string, don't loop forever if it is
-    }
+    if (_p) {
-
+        while (_n.length < _l) {
-    function hours12(d) {
+            _n = _p + _n;
-        var hour = d.getHours();
-
-        if (hour === 0) {
-            hour = 12;
-        } else if (hour > 12) {
-            hour -= 12;
-        }
-
-        return hour;
-    }
-
-    // Get the ordinal suffix for a number: st, nd, rd, or th
-    function ordinal(n) {
-        var i = n % 10;
-        var ii = n % 100;
-
-        if ((ii >= 11 && ii <= 13) || i === 0 || i >= 4) {
-            return 'th';
-        }
-
-        switch (i) {
-            case 1:
-                return 'st';
-            case 2:
-                return 'nd';
-            case 3:
-                return 'rd';
         }
     }
 
-    // firstWeekday: 'sunday' or 'monday', default is 'sunday'
+    return _n;
-    // Pilfered & ported from Ruby's strftime implementation.
+}
-    function weekNumber(d, firstWeekday) {
-        var firstDayOfYear = new Date(d.getFullYear(), 0, 1);
-        // This works by shifting the weekday back by one day if we
-        // are treating Monday as the first day of the week.
-        var wDay = d.getDay();
-        var yDay = (d - firstDayOfYear) / 86400000;
 
-        if (firstWeekday === 'monday') {
+function hours12(d) {
-            if (wDay === 0) {
+    var hour = d.getHours();
-                // Sunday
-                wDay = 6;
-            } else {
-                wDay--;
-            }
-        }
 
-        return Math.floor((yDay + 7 - wDay) / 7);
+    if (hour === 0) {
+        hour = 12;
+    } else if (hour > 12) {
+        hour -= 12;
     }
 
-    function strftime(fmt, d, locale) {
+    return hour;
-        return _strftime(fmt, d, locale);
+}
+
+// Get the ordinal suffix for a number: st, nd, rd, or th
+function ordinal(n) {
+    var i = n % 10;
+    var ii = n % 100;
+
+    if ((ii >= 11 && ii <= 13) || i === 0 || i >= 4) {
+        return 'th';
     }
 
-    function isDate(date) {
+    switch (i) {
-        return toString.call(date) === '[object Date]';
+        case 1:
+            return 'st';
+        case 2:
+            return 'nd';
+        case 3:
+            return 'rd';
+    }
+}
+
+// firstWeekday: 'sunday' or 'monday', default is 'sunday'
+// Pilfered & ported from Ruby's strftime implementation.
+function weekNumber(d, firstWeekday) {
+    var firstDayOfYear = new Date(d.getFullYear(), 0, 1);
+    // This works by shifting the weekday back by one day if we
+    // are treating Monday as the first day of the week.
+    var wDay = d.getDay();
+    var yDay = (d - firstDayOfYear) / 86400000;
+
+    if (firstWeekday === 'monday') {
+        if (wDay === 0) {
+            // Sunday
+            wDay = 6;
+        } else {
+            wDay--;
+        }
     }
 
-    // ISO 8601 format timezone string, [-+]HHMM
+    return Math.floor((yDay + 7 - wDay) / 7);
-    // Convert to the number of minutes and it'll be applied to the date below.
+}
-    function fixTZ(date, opt) {
-        var d = date;
-        var tz = opt.timezone;
-        var tzType = typeof tz;
 
-        if (opt.utc || tzType == 'number' || tzType == 'string') {
+function strftime(fmt, d, locale) {
-            d = dateToUTC(d);
+    return _strftime(fmt, d, locale);
-        }
+}
 
-        if (tz) {
+function isDate(date) {
-            if (tzType == 'string') {
+    return toString.call(date) === '[object Date]';
-                var s = tz[0] === '-' ? -1 : 1;
+}
-                var h = parseInt(tz.slice(1, 3), 10);
-                var m = parseInt(tz.slice(3, 5), 10);
 
-                tz = s * (60 * h) + m;
+// ISO 8601 format timezone string, [-+]HHMM
-            }
+// Convert to the number of minutes and it'll be applied to the date below.
+function fixTZ(date, opt) {
+    var d = date;
+    var tz = opt.timezone;
+    var tzType = typeof tz;
 
-            d = new Date(d.getTime() + (tz * 60000));
+    if (opt.utc || tzType == 'number' || tzType == 'string') {
-            opt.timezone = tz;
+        d = dateToUTC(d);
-        }
-
-        return d;
     }
 
-    namespace.strftime = strftime;
+    if (tz) {
+        if (tzType == 'string') {
+            var s = tz[0] === '-' ? -1 : 1;
+            var h = parseInt(tz.slice(1, 3), 10);
+            var m = parseInt(tz.slice(3, 5), 10);
 
-    namespace.strftimeTZ = strftime.strftimeTZ = function strfTimeTZ(fmt, d, locale, timeZone) {
+            tz = s * (60 * h) + m;
-        var _locale = locale;
-        var _timeZone = timeZone;
-
-        if ((typeof locale === 'number' || typeof locale === 'string') && timeZone == null) {
-            _timeZone = locale;
-            _locale = undefined;
         }
 
-        return _strftime(fmt, d, _locale, {
+        d = new Date(d.getTime() + (tz * 60000));
-            timezone: _timeZone
+        opt.timezone = tz;
-        });
+    }
-    };
+
-
+    return d;
-    namespace.strftimeUTC = strftime.strftimeUTC = function strftimeUTC(fmt, d, locale) {
+}
-        return _strftime(fmt, d, locale, {
+
-            utc: true
+namespace.strftime = strftime;
-        });
+
-    };
+namespace.strftimeTZ = strftime.strftimeTZ = function strfTimeTZ(fmt, d, locale, timeZone) {
-
+    var _locale = locale;
-    namespace.localizedStrftime = strftime.localizedStrftime = function localizedStrftime(locale) {
+    var _timeZone = timeZone;
-        return function (fmt, d, options) {
+
-            return _strftime(fmt, d, locale, options);
+    if ((typeof locale === 'number' || typeof locale === 'string') && timeZone == null) {
-        };
+        _timeZone = locale;
+        _locale = undefined;
+    }
+
+    return _strftime(fmt, d, _locale, {
+        timezone: _timeZone
+    });
+};
+
+namespace.strftimeUTC = strftime.strftimeUTC = function strftimeUTC(fmt, d, locale) {
+    return _strftime(fmt, d, locale, {
+        utc: true
+    });
+};
+
+namespace.localizedStrftime = strftime.localizedStrftime = function localizedStrftime(locale) {
+    return function (fmt, d, options) {
+        return _strftime(fmt, d, locale, options);
     };
+};
 
 }());