From: Tim Wood Date: Mon, 24 Oct 2011 17:55:03 +0000 (-0700) Subject: Fixing regex for `L LL LLL LLLL` and updating version number for 1.1.0 X-Git-Tag: 1.1.0~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cf6a3aeba18bf6bc1bd34698cce16719e674489;p=thirdparty%2Fmoment.git Fixing regex for `L LL LLL LLLL` and updating version number for 1.1.0 --- diff --git a/build.js b/build.js index fdc842419..80c5bfbe9 100755 --- a/build.js +++ b/build.js @@ -38,7 +38,7 @@ var JSHINT_CONFIG = { var LANG_MINIFY = "fr it pt".split(" "); var LANG_TEST = "en fr it pt".split(" "); var LANG_PREFIX = "var moment;if (typeof window === 'undefined') {moment = require('../moment.js');module = QUnit.module;}"; -var VERSION = '1.0.1'; +var VERSION = '1.1.0'; var MINIFY_COMMENT = '/* Moment.js | version : ' + VERSION + ' | author : Tim Wood | license : MIT */\n'; diff --git a/docs/index.html b/docs/index.html index 6e66278ac..50e51456d 100644 --- a/docs/index.html +++ b/docs/index.html @@ -68,6 +68,7 @@
  • Month Abbreviations
  • Weekday Names
  • Weekday Abbreviations
    • +
  • Long Date Formats
  • Relative Time
  • Ordinal
    • @@ -81,10 +82,10 @@

    Github

    - Development Version (1.0.0) 16k Source + Comments + Development Version (1.1.0) 16k Source + Comments

    - Production Version (1.0.0) 2.2k Minified + Gzipped. + Production Version (1.1.0) 2.3k Minified + Gzipped.

    You can also clone the project with Git by running: 

    $ git clone git://github.com/timrwood/moment
    @@ -570,7 +571,7 @@ moment(date).format("ddd, hA"); // "Sun, 3PM" EST CST ... MST PST - Long date + Localized date format diff --git a/moment.js b/moment.js index fc701bc91..e04c87402 100644 --- a/moment.js +++ b/moment.js @@ -3,7 +3,7 @@ // (c) 2011 Tim Wood // Moment.js is freely distributable under the terms of the MIT license. // -// Version 1.0.1 +// Version 1.1.0 (function (Date, undefined) { @@ -13,7 +13,7 @@ hasModule = (typeof module !== 'undefined'), paramsToParse = 'months|monthsShort|weekdays|weekdaysShort|longDateFormat|relativeTime|ordinal'.split('|'), i, - VERSION = "1.0.1", + VERSION = "1.1.0", shortcuts = 'Month|Date|Hours|Minutes|Seconds'.split('|'); // left zero fill a number @@ -76,7 +76,7 @@ currentHours = date.getHours(), currentMinutes = date.getMinutes(), currentSeconds = date.getSeconds(), - charactersToReplace = /(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|dddd?|do?|w[o|w]?|YYYY|YY|a|A|hh?|HH?|mm?|ss?|zz?|L?L?L?L?)/g, + charactersToReplace = /(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|dddd?|do?|w[o|w]?|YYYY|YY|a|A|hh?|HH?|mm?|ss?|zz?|LL?L?L?)/g, nonuppercaseLetters = /[^A-Z]/g, timezoneRegex = /\([A-Za-z ]+\)|:[0-9]{2} [A-Z]{3} /g; // check if the character is a format diff --git a/moment.min.js b/moment.min.js index 305ad3911..dadbb6c9e 100755 --- a/moment.min.js +++ b/moment.min.js @@ -1,2 +1,2 @@ -/* Moment.js | version : 1.0.1 | author : Tim Wood | license : MIT */ -(function(a,b){function k(a,b){var c=a+"";while(c.length11?"pm":"am";case"A":return i>11?"PM":"AM";case"H":return i;case"HH":return k(i,2);case"h":return i%12||12;case"hh":return k(i%12||12,2);case"m":return j;case"mm":return k(j,2);case"s":return l;case"ss":return k(l,2);case"zz":case"z":return(b.toString().match(p)||[""])[0].replace(n,"");case"L":case"LL":case"LLL":case"LLLL":return o(b,c.longDateFormat[d]);default:return d.replace("\\","")}}var e=b.getMonth(),f=b.getDate(),g=b.getFullYear(),h=b.getDay(),i=b.getHours(),j=b.getMinutes(),l=b.getSeconds(),m=/(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|dddd?|do?|w[o|w]?|YYYY|YY|a|A|hh?|HH?|mm?|ss?|zz?|L?L?L?L?)/g,n=/[^A-Z]/g,p=/\([A-Za-z ]+\)|:[0-9]{2} [A-Z]{3} /g;return d.replace(m,q)}function p(a,b){function i(a,b){switch(a){case"M":case"MM":c[1]=~~b-1;break;case"D":case"DD":case"DDD":case"DDDD":c[2]=~~b;break;case"YY":b=~~b,c[0]=b+(b>70?1900:2e3);break;case"YYYY":c[0]=~~b;break;case"a":case"A":h=b.toLowerCase()==="pm";break;case"H":case"HH":case"h":case"hh":c[3]=~~b;break;case"m":case"mm":c[4]=~~b;break;case"s":case"ss":c[5]=~~b}}var c=[0],d=/[0-9a-zA-Z]+/g,e=a.match(d),f=b.match(d),g,h;for(g=0;g11?"pm":"am";case"A":return i>11?"PM":"AM";case"H":return i;case"HH":return k(i,2);case"h":return i%12||12;case"hh":return k(i%12||12,2);case"m":return j;case"mm":return k(j,2);case"s":return l;case"ss":return k(l,2);case"zz":case"z":return(b.toString().match(p)||[""])[0].replace(n,"");case"L":case"LL":case"LLL":case"LLLL":return o(b,c.longDateFormat[d]);default:return d.replace("\\","")}}var e=b.getMonth(),f=b.getDate(),g=b.getFullYear(),h=b.getDay(),i=b.getHours(),j=b.getMinutes(),l=b.getSeconds(),m=/(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|dddd?|do?|w[o|w]?|YYYY|YY|a|A|hh?|HH?|mm?|ss?|zz?|LL?L?L?)/g,n=/[^A-Z]/g,p=/\([A-Za-z ]+\)|:[0-9]{2} [A-Z]{3} /g;return d.replace(m,q)}function p(a,b){function i(a,b){switch(a){case"M":case"MM":c[1]=~~b-1;break;case"D":case"DD":case"DDD":case"DDDD":c[2]=~~b;break;case"YY":b=~~b,c[0]=b+(b>70?1900:2e3);break;case"YYYY":c[0]=~~b;break;case"a":case"A":h=b.toLowerCase()==="pm";break;case"H":case"HH":case"h":case"hh":c[3]=~~b;break;case"m":case"mm":c[4]=~~b;break;case"s":case"ss":c[5]=~~b}}var c=[0],d=/[0-9a-zA-Z]+/g,e=a.match(d),f=b.match(d),g,h;for(g=0;g (http://timwoodcreates.com/)",