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/ui/flow.reel/flow.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/ui/flow.reel/flow.js')
-rw-r--r-- | node_modules/montage/ui/flow.reel/flow.js | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/node_modules/montage/ui/flow.reel/flow.js b/node_modules/montage/ui/flow.reel/flow.js index 365fceb5..579b284e 100644 --- a/node_modules/montage/ui/flow.reel/flow.js +++ b/node_modules/montage/ui/flow.reel/flow.js | |||
@@ -440,12 +440,12 @@ var Flow = exports.Flow = Montage.create(Component, { | |||
440 | } | 440 | } |
441 | } | 441 | } |
442 | }, | 442 | }, |
443 | 443 | ||
444 | _halfPI: { | 444 | _halfPI: { |
445 | enumerable: false, | 445 | enumerable: false, |
446 | value: Math.PI*0.5 | 446 | value: Math.PI*0.5 |
447 | }, | 447 | }, |
448 | 448 | ||
449 | _doublePI: { | 449 | _doublePI: { |
450 | enumerable: false, | 450 | enumerable: false, |
451 | value: Math.PI*2 | 451 | value: Math.PI*2 |
@@ -807,19 +807,19 @@ var Flow = exports.Flow = Montage.create(Component, { | |||
807 | distinct: true, | 807 | distinct: true, |
808 | value: [] | 808 | value: [] |
809 | }, | 809 | }, |
810 | 810 | ||
811 | _cachedPosParameter: { | 811 | _cachedPosParameter: { |
812 | enumerable: false, | 812 | enumerable: false, |
813 | distinct: true, | 813 | distinct: true, |
814 | value: {} | 814 | value: {} |
815 | }, | 815 | }, |
816 | 816 | ||
817 | _cachedDrawOffset: { | 817 | _cachedDrawOffset: { |
818 | enumerable: false, | 818 | enumerable: false, |
819 | distinct: true, | 819 | distinct: true, |
820 | value: {} | 820 | value: {} |
821 | }, | 821 | }, |
822 | 822 | ||
823 | 823 | ||
824 | _cachedSlide: { | 824 | _cachedSlide: { |
825 | enumerable: false, | 825 | enumerable: false, |