diff options
author | Pushkar Joshi | 2012-05-31 12:20:03 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-05-31 12:20:03 -0700 |
commit | 4bc52365b1f81a386c3c59fd7c6ad874bb387cb5 (patch) | |
tree | c5b17297aba04bd54a59cf6214d29486e089031b /node_modules/montage/core/converter | |
parent | 75a862d305bc4502e22bc5aa65fa271143b8cf6c (diff) | |
parent | 6042bdc5f2aada4412912fd01602d32c9088dc26 (diff) | |
download | ninja-4bc52365b1f81a386c3c59fd7c6ad874bb387cb5.tar.gz |
Merge branch 'master' into pentool
Diffstat (limited to 'node_modules/montage/core/converter')
-rwxr-xr-x | node_modules/montage/core/converter/date-converter.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/node_modules/montage/core/converter/date-converter.js b/node_modules/montage/core/converter/date-converter.js index f484f7aa..7b062925 100755 --- a/node_modules/montage/core/converter/date-converter.js +++ b/node_modules/montage/core/converter/date-converter.js | |||
@@ -1582,7 +1582,7 @@ var Montage = require("montage").Montage, | |||
1582 | return function (s) { | 1582 | return function (s) { |
1583 | var rx = _fn.call(this, s); | 1583 | var rx = _fn.call(this, s); |
1584 | return [ | 1584 | return [ |
1585 | [rx[0][0], r[0][2]], | 1585 | [rx[0][0], rx[0][2]], |
1586 | rx[1] | 1586 | rx[1] |
1587 | ]; | 1587 | ]; |
1588 | }; | 1588 | }; |
@@ -1592,7 +1592,7 @@ var Montage = require("montage").Montage, | |||
1592 | c = c || null; | 1592 | c = c || null; |
1593 | return (p instanceof Array ? | 1593 | return (p instanceof Array ? |
1594 | _.each(_.product(p.slice(0, -1), _.ignore(d)), p.slice(-1), _.ignore(c)) : | 1594 | _.each(_.product(p.slice(0, -1), _.ignore(d)), p.slice(-1), _.ignore(c)) : |
1595 | _.each(_.many(_.each(p, _.ignore(d))), px, _.ignore(c))); | 1595 | _.each(_.many(_.each(p, _.ignore(d))), p, _.ignore(c))); |
1596 | }, | 1596 | }, |
1597 | set: function (px, d, c) { | 1597 | set: function (px, d, c) { |
1598 | d = d || _.rtoken(/^\s*/); | 1598 | d = d || _.rtoken(/^\s*/); |