aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/core/converter
diff options
context:
space:
mode:
authorValerio Virgillito2012-05-16 15:23:48 -0700
committerValerio Virgillito2012-05-16 15:23:48 -0700
commit13ae16997d4bbca14e255d5989d1c44a76eac72c (patch)
treed9ebb1dcc6bebee4cb910b950ecb67c1a2d593cd /node_modules/montage/core/converter
parent99f16ae08fbb0a6dfe6008c9833f2253b18c19e5 (diff)
downloadninja-13ae16997d4bbca14e255d5989d1c44a76eac72c.tar.gz
montage v.0.10 integration
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'node_modules/montage/core/converter')
-rwxr-xr-xnode_modules/montage/core/converter/date-converter.js4
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*/);