]> git.ipfire.org Git - thirdparty/moment.git/commitdiff
Merge pull request #911 from ichernev/feature/uninstall-lang
authorTim Wood <washwithcare@gmail.com>
Tue, 23 Jul 2013 16:12:24 +0000 (09:12 -0700)
committerTim Wood <washwithcare@gmail.com>
Tue, 23 Jul 2013 16:12:24 +0000 (09:12 -0700)
Added a way to uninstall a language definition

1  2 
moment.js
test/moment/create.js
test/moment/format.js
test/moment/weekday.js

diff --cc moment.js
Simple merge
Simple merge
index 1265a59448bc6223a770f134b46b26dc7b204cd7,2907cec6d9833ac47df842ad168ff363889292a7..fd0e1e59128202b0e3e26fa2e3e6a6ebb5d5aa79
@@@ -301,11 -298,12 +301,12 @@@ exports.format = 
          test.done();
      },
  
 -    "toJSON skips postformat" : function(test) {
 +    "toJSON skips postformat" : function (test) {
          test.expect(1);
  
 -        moment.lang('postformat', {postformat: function(s) { s.replace(/./g, 'X') }});
 +        moment.lang('postformat', {postformat: function (s) { s.replace(/./g, 'X'); }});
          test.equal(moment.utc([2000, 0, 1]).toJSON(), "2000-01-01T00:00:00.000Z", "toJSON doesn't postformat");
+         moment.lang('postformat', null);
          test.done();
      }
  };
Simple merge