stripped a few more bytes off by caching the date.prototype to _DateProto

diff --git a/README.markdown b/README.markdown
index adcc94b62dc06e4c261c959a887ad086b03fc134..703613eb75e3a6c4a126aa0c142eb0df012a6080 100644 (file)
--- a/README.markdown
+++ b/README.markdown
@@ -21,8 +21,8 @@ In addition to the date creation and manipulation functions, there are a few fun
         <th>gzipped</th>
     </tr>
     <tr>
-       <td>3.58 kb</td>
-       <td>1.6 kb</td>
+       <td>3.51 kb</td>
+       <td>1.59 kb</td>
     </tr>
 </table>
 

diff --git a/lib/underscore.date.js b/lib/underscore.date.js
index c077254c4d3344471352d60f91066219c5151657..8e8ef82a4bc90d71e74a3c6ac8a28a7e52e134c0 100644 (file)
--- a/lib/underscore.date.js
+++ b/lib/underscore.date.js
@@ -122,8 +122,9 @@
         return this;
     }
     
+    var _DateProto = _Date.prototype;
     
-    _Date.prototype.format = function(inputString) {
+    _DateProto.format = function(inputString) {
         // shortcuts to this and getting time functions
         // done to save bytes in minification
         var date = this.date,
@@ -241,15 +242,15 @@
         return inputString.replace(charactersToReplace, replaceFunction);
     };
     
-    _Date.prototype.add = function(input) {
+    _DateProto.add = function(input) {
         return dateAddRemove(this, input, 1);
     };
     
-    _Date.prototype.subtract = function(input) {
+    _DateProto.subtract = function(input) {
         return dateAddRemove(this, input, -1);
     };
     
-    _Date.prototype.customize = function(input) {
+    _DateProto.customize = function(input) {
         var inputOrdinal = input.ordinal;
         _.extend(wordsWeekdays, input.weekdays);
         _.extend(wordsWeekdaysShort, input.weekdaysShort);
@@ -284,7 +285,7 @@
             substituteTimeAgo('yy', ~~ years);
     }
     
-    _Date.prototype.from = function(time, withoutSuffix, asMilliseconds) {
+    _DateProto.from = function(time, withoutSuffix, asMilliseconds) {
         var difference = msApart(this.date, time),
             string = difference < 0 ? wordsTimeAgo.past : wordsTimeAgo.future;
         return asMilliseconds ? difference : 
@@ -292,30 +293,25 @@
             string.replace(/%s/i, relativeTime(difference));
     };
     
-    _Date.prototype.fromNow = function(withoutSuffix, asMilliseconds) {
+    _DateProto.fromNow = function(withoutSuffix, asMilliseconds) {
         return this.from(_.now(), withoutSuffix, asMilliseconds);
     };
     
-    _Date.prototype.isLeapYear = function() {
+    _DateProto.isLeapYear = function() {
         return _.isLeapYear(this.date.getFullYear());
     };
     
-    // underscore mixins
-    _d = {
+    // integrate with underscore.js
+    _.mixin({
         date : function(input) {
             return new _Date(input);
         },
         now : function(asTimestamp) {
-            return asTimestamp ? new Date().getTime() : _d.date();
+            return asTimestamp ? new Date().getTime() : _.date();
         },
         isLeapYear : function(year) {
             return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
         }
-    };
-    
-    // integrate with underscore.js
-    if (_ && _.mixin) {
-        _.mixin(_d);
-    }
+    });
     
 }(Date, _));

diff --git a/lib/underscore.date.min.js b/lib/underscore.date.min.js
index e9e4c673d5c6e52a589275bae5f2b3118a88edab..885e2fe63272608d5753a1c95ee232d41566d920 100644 (file)
--- a/lib/underscore.date.min.js
+++ b/lib/underscore.date.min.js
@@ -5,4 +5,4 @@
 //
 // Version 0.3.2
 
-(function(a,b,c){function u(a){var b=Math.abs(a)/1e3,c=b/60,d=c/60,e=d/24,f=e/365;return b<45&&r("s",~~b)||b<90&&r("m")||c<45&&r("mm",~~c)||c<90&&r("h")||d<24&&r("hh",~~d)||d<48&&r("d")||e<25&&r("dd",~~e)||e<45&&r("M")||e<350&&r("MM",~~((e+15)/30))||f<2&&r("y")||r("yy",~~f)}function t(a,b){return q(a)-q(b)}function s(a){this.date=p(a);return this}function r(a,b){return k[a].replace(/%d/i,b||1)}function q(a){return isNaN(a)?p(a).getTime():a}function p(d){return d===c?new a:d instanceof s?d.date:b.isDate(d)?d:b.isArray(d)&&d.length>2?o(d):new a(d)}function o(b){return new a(b[0],b[1]||0,b[2]||1,b[3]||0,b[4]||0,b[5]||0,b[6]||0)}function n(b,c,d){var e=b.date,f=(c.ms||0)+(c.s||0)*1e3+(c.m||0)*6e4+(c.h||0)*36e5+(c.d||0)*864e5+(c.w||0)*6048e5,g=(c.M||0)+(c.y||0)*12,h;f&&e.setMilliseconds(e.getMilliseconds()+f*d),g&&(h=e.getDate(),e.setDate(1),e.setMonth(e.getMonth()+g*d),e.setDate(Math.min((new a(e.getFullYear(),e.getMonth()+1,0)).getDate(),h)));return b}function m(a,b){var c=a+"";while(c.length<b)c="0"+c;return c}function d(a){return a.slice(0,3)}var e=this,f,g=["January","February","March","April","May","June","July","August","September","October","November","December"],h=b.map(g,d),i=["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],j=b.map(i,d),k={future:"in %s",past:"%s ago",s:"seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},l=function(a){var b=a%10;return~~(a%100/10)===1?"th":b===1?"st":b===2?"nd":b===3?"rd":"th"};s.prototype.format=function(b){function t(b){var c,r;switch(b){case"M":return d+1;case"Mo":return d+1+l(d+1);case"MM":return m(d+1,2);case"MMM":return h[d];case"MMMM":return g[d];case"D":return e;case"Do":return e+l(e);case"DD":return m(e,2);case"DDD":c=new a(f,d,e),r=new a(f,0,1);return~~((c-r)/864e5+1.5);case"DDDo":c=t("DDD");return c+l(c);case"DDDD":return m(t("DDD"),3);case"d":return k;case"do":return k+l(k);case"ddd":return j[k];case"dddd":return i[k];case"w":c=new a(f,d,e-k+5),r=new a(c.getFullYear(),0,4);return~~((c-r)/864e5/7+1.5);case"wo":c=t("w");return c+l(c);case"ww":return m(t("w"),2);case"YY":return(f+"").slice(-2);case"YYYY":return f;case"a":return n>11?"pm":"am";case"A":return n>11?"PM":"AM";case"H":return n;case"HH":return m(n,2);case"h":return n%12||12;case"hh":return m(n%12||12,2);case"m":return o;case"mm":return m(o,2);case"s":return p;case"ss":return m(p,2);case"z":return t("zz").replace(s,"");case"zz":c=q.indexOf("(");if(c>-1)return q.slice(c+1,q.indexOf(")"));return q.slice(q.indexOf(":")).replace(s,"");default:return b.replace("\\","")}}var c=this.date,d=c.getMonth(),e=c.getDate(),f=c.getFullYear(),k=c.getDay(),n=c.getHours(),o=c.getMinutes(),p=c.getSeconds(),q=c.toString(),r=/(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|dddd?|do?|w[o|w]?|YYYY|YY|a|A|hh?|HH?|mm?|ss?|zz?)/g,s=/[^A-Z]/g;return b.replace(r,t)},s.prototype.add=function(a){return n(this,a,1)},s.prototype.subtract=function(a){return n(this,a,-1)},s.prototype.customize=function(a){var c=a.ordinal;b.extend(i,a.weekdays),b.extend(j,a.weekdaysShort),b.extend(g,a.months),b.extend(h,a.monthsShort),b.extend(k,a.relativeTime),c&&b.isFunction(c)&&(l=c)},s.prototype.from=function(a,b,c){var d=t(this.date,a),e=d<0?k.past:k.future;return c?d:b?u(d):e.replace(/%s/i,u(d))},s.prototype.fromNow=function(a,c){return this.from(b.now(),a,c)},s.prototype.isLeapYear=function(){return b.isLeapYear(this.date.getFullYear())},f={date:function(a){return new s(a)},now:function(b){return b?(new a).getTime():f.date()},isLeapYear:function(a){return a%4===0&&a%100!==0||a%400===0}},b&&b.mixin&&b.mixin(f)})(Date,_)
+(function(a,b,c){function v(a){var b=Math.abs(a)/1e3,c=b/60,d=c/60,e=d/24,f=e/365;return b<45&&r("s",~~b)||b<90&&r("m")||c<45&&r("mm",~~c)||c<90&&r("h")||d<24&&r("hh",~~d)||d<48&&r("d")||e<25&&r("dd",~~e)||e<45&&r("M")||e<350&&r("MM",~~((e+15)/30))||f<2&&r("y")||r("yy",~~f)}function u(a,b){return q(a)-q(b)}function s(a){this.date=p(a);return this}function r(a,b){return k[a].replace(/%d/i,b||1)}function q(a){return isNaN(a)?p(a).getTime():a}function p(d){return d===c?new a:d instanceof s?d.date:b.isDate(d)?d:b.isArray(d)&&d.length>2?o(d):new a(d)}function o(b){return new a(b[0],b[1]||0,b[2]||1,b[3]||0,b[4]||0,b[5]||0,b[6]||0)}function n(b,c,d){var e=b.date,f=(c.ms||0)+(c.s||0)*1e3+(c.m||0)*6e4+(c.h||0)*36e5+(c.d||0)*864e5+(c.w||0)*6048e5,g=(c.M||0)+(c.y||0)*12,h;f&&e.setMilliseconds(e.getMilliseconds()+f*d),g&&(h=e.getDate(),e.setDate(1),e.setMonth(e.getMonth()+g*d),e.setDate(Math.min((new a(e.getFullYear(),e.getMonth()+1,0)).getDate(),h)));return b}function m(a,b){var c=a+"";while(c.length<b)c="0"+c;return c}function d(a){return a.slice(0,3)}var e=this,f,g=["January","February","March","April","May","June","July","August","September","October","November","December"],h=b.map(g,d),i=["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],j=b.map(i,d),k={future:"in %s",past:"%s ago",s:"seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},l=function(a){var b=a%10;return~~(a%100/10)===1?"th":b===1?"st":b===2?"nd":b===3?"rd":"th"},t=s.prototype;t.format=function(b){function t(b){var c,r;switch(b){case"M":return d+1;case"Mo":return d+1+l(d+1);case"MM":return m(d+1,2);case"MMM":return h[d];case"MMMM":return g[d];case"D":return e;case"Do":return e+l(e);case"DD":return m(e,2);case"DDD":c=new a(f,d,e),r=new a(f,0,1);return~~((c-r)/864e5+1.5);case"DDDo":c=t("DDD");return c+l(c);case"DDDD":return m(t("DDD"),3);case"d":return k;case"do":return k+l(k);case"ddd":return j[k];case"dddd":return i[k];case"w":c=new a(f,d,e-k+5),r=new a(c.getFullYear(),0,4);return~~((c-r)/864e5/7+1.5);case"wo":c=t("w");return c+l(c);case"ww":return m(t("w"),2);case"YY":return(f+"").slice(-2);case"YYYY":return f;case"a":return n>11?"pm":"am";case"A":return n>11?"PM":"AM";case"H":return n;case"HH":return m(n,2);case"h":return n%12||12;case"hh":return m(n%12||12,2);case"m":return o;case"mm":return m(o,2);case"s":return p;case"ss":return m(p,2);case"z":return t("zz").replace(s,"");case"zz":c=q.indexOf("(");if(c>-1)return q.slice(c+1,q.indexOf(")"));return q.slice(q.indexOf(":")).replace(s,"");default:return b.replace("\\","")}}var c=this.date,d=c.getMonth(),e=c.getDate(),f=c.getFullYear(),k=c.getDay(),n=c.getHours(),o=c.getMinutes(),p=c.getSeconds(),q=c.toString(),r=/(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|dddd?|do?|w[o|w]?|YYYY|YY|a|A|hh?|HH?|mm?|ss?|zz?)/g,s=/[^A-Z]/g;return b.replace(r,t)},t.add=function(a){return n(this,a,1)},t.subtract=function(a){return n(this,a,-1)},t.customize=function(a){var c=a.ordinal;b.extend(i,a.weekdays),b.extend(j,a.weekdaysShort),b.extend(g,a.months),b.extend(h,a.monthsShort),b.extend(k,a.relativeTime),c&&b.isFunction(c)&&(l=c)},t.from=function(a,b,c){var d=u(this.date,a),e=d<0?k.past:k.future;return c?d:b?v(d):e.replace(/%s/i,v(d))},t.fromNow=function(a,c){return this.from(b.now(),a,c)},t.isLeapYear=function(){return b.isLeapYear(this.date.getFullYear())},b.mixin({date:function(a){return new s(a)},now:function(c){return c?(new a).getTime():b.date()},isLeapYear:function(a){return a%4===0&&a%100!==0||a%400===0}})})(Date,_)