diff options
author | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-09 14:35:44 -0700 |
commit | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (patch) | |
tree | 3f56cbed2f08c5a81ea79eaf0bcb9bd031d8a627 /node_modules/montage/core/converter/date-converter.js | |
parent | c0a42c56f768a873ba637f5b86d5f6a84d4a3312 (diff) | |
parent | 40c6eb2c06b34f65a74d59ef9687251952858bab (diff) | |
download | ninja-84b3327bd92faafab7954b5eb64c7abe24a3fe13.tar.gz |
Merge branch 'normalize' of https://github.com/kriskowal/ninja-internal
Conflicts:
js/components/gradientpicker.reel/gradientpicker.js
js/components/tools-properties/text-properties.reel/text-properties.js
js/document/views/base.js
js/document/views/design.js
js/helper-classes/3D/StageLine.js
js/helper-classes/3D/draw-utils.js
js/lib/drawing/world.js
js/lib/geom/circle.js
js/lib/geom/line.js
js/lib/geom/rectangle.js
js/lib/geom/shape-primitive.js
js/lib/rdge/materials/bump-metal-material.js
js/lib/rdge/materials/flag-material.js
js/lib/rdge/materials/fly-material.js
js/lib/rdge/materials/julia-material.js
js/lib/rdge/materials/keleidoscope-material.js
js/lib/rdge/materials/mandel-material.js
js/lib/rdge/materials/material.js
js/lib/rdge/materials/plasma-material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/radial-gradient-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/water-material.js
js/panels/Materials/materials-library-panel.reel/materials-library-panel.html
js/panels/Materials/materials-library-panel.reel/materials-library-panel.js
js/panels/Materials/materials-popup.reel/materials-popup.html
js/panels/Materials/materials-popup.reel/materials-popup.js
js/tools/LineTool.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'node_modules/montage/core/converter/date-converter.js')
-rwxr-xr-x | node_modules/montage/core/converter/date-converter.js | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/node_modules/montage/core/converter/date-converter.js b/node_modules/montage/core/converter/date-converter.js index 38ad8f96..0c0ae09a 100755 --- a/node_modules/montage/core/converter/date-converter.js +++ b/node_modules/montage/core/converter/date-converter.js | |||
@@ -36,7 +36,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
36 | @website: http://www.datejs.com/ | 36 | @website: http://www.datejs.com/ |
37 | */ | 37 | */ |
38 | /** | 38 | /** |
39 | @module montage/core/converter/date-converter | 39 | @module montage/core/converter/date-converter |
40 | @requires montage/core/core | 40 | @requires montage/core/core |
41 | @requires montage/core/converter/converter | 41 | @requires montage/core/converter/converter |
42 | */ | 42 | */ |
@@ -2277,14 +2277,14 @@ var Montage = require("montage").Montage, | |||
2277 | 2277 | ||
2278 | var _F = { | 2278 | var _F = { |
2279 | //"M/d/yyyy": function (s) { | 2279 | //"M/d/yyyy": function (s) { |
2280 | // var m = s.match(/^([0-2]\d|3[0-1]|\d)\/(1[0-2]|0\d|\d)\/(\d\d\d\d)/); | 2280 | // var m = s.match(/^([0-2]\d|3[0-1]|\d)\/(1[0-2]|0\d|\d)\/(\d\d\d\d)/); |
2281 | // if (m!=null) { | 2281 | // if (m!=null) { |
2282 | // var r = [ t.month.call(this,m[1]), t.day.call(this,m[2]), t.year.call(this,m[3]) ]; | 2282 | // var r = [ t.month.call(this,m[1]), t.day.call(this,m[2]), t.year.call(this,m[3]) ]; |
2283 | // r = t.finishExact.call(this,r); | 2283 | // r = t.finishExact.call(this,r); |
2284 | // return [ r, "" ]; | 2284 | // return [ r, "" ]; |
2285 | // } else { | 2285 | // } else { |
2286 | // throw new Date.Parsing.Exception(s); | 2286 | // throw new Date.Parsing.Exception(s); |
2287 | // } | 2287 | // } |
2288 | //} | 2288 | //} |
2289 | //"M/d/yyyy": function (s) { return [ new Date(Date._parse(s)), ""]; } | 2289 | //"M/d/yyyy": function (s) { return [ new Date(Date._parse(s)), ""]; } |
2290 | }; | 2290 | }; |