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 /js/components/hottext.reel | |
| 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 'js/components/hottext.reel')
| -rwxr-xr-x | js/components/hottext.reel/hottext.html | 4 | ||||
| -rwxr-xr-x | js/components/hottext.reel/hottext.js | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/js/components/hottext.reel/hottext.html b/js/components/hottext.reel/hottext.html index 5d14f49e..c13f36f8 100755 --- a/js/components/hottext.reel/hottext.html +++ b/js/components/hottext.reel/hottext.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!doctype html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
| 4 | All Rights Reserved. | 4 | All Rights Reserved. |
| @@ -44,7 +44,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 44 | } | 44 | } |
| 45 | } | 45 | } |
| 46 | </script> | 46 | </script> |
| 47 | 47 | ||
| 48 | </head> | 48 | </head> |
| 49 | <body> | 49 | <body> |
| 50 | <input data-montage-id="hottext" class="hottext"/> | 50 | <input data-montage-id="hottext" class="hottext"/> |
diff --git a/js/components/hottext.reel/hottext.js b/js/components/hottext.reel/hottext.js index f49bfc5f..5e362b46 100755 --- a/js/components/hottext.reel/hottext.js +++ b/js/components/hottext.reel/hottext.js | |||
| @@ -214,7 +214,7 @@ var HotText = exports.HotText = Montage.create(SliderBase, { | |||
| 214 | 214 | ||
| 215 | var dX = clickPoint.x - this._xStart; | 215 | var dX = clickPoint.x - this._xStart; |
| 216 | var dY = clickPoint.y - this._yStart; | 216 | var dY = clickPoint.y - this._yStart; |
| 217 | 217 | ||
| 218 | var dXAbs = Math.abs(dX); | 218 | var dXAbs = Math.abs(dX); |
| 219 | var dYAbs = Math.abs(dY); | 219 | var dYAbs = Math.abs(dY); |
| 220 | 220 | ||
| @@ -224,7 +224,7 @@ var HotText = exports.HotText = Montage.create(SliderBase, { | |||
| 224 | } | 224 | } |
| 225 | 225 | ||
| 226 | var incrementVal = dXAbs-4; // otherwise, the first value change will be 5 pixels | 226 | var incrementVal = dXAbs-4; // otherwise, the first value change will be 5 pixels |
| 227 | var multFactor = 1; | 227 | var multFactor = 1; |
| 228 | 228 | ||
| 229 | if(dXAbs > dYAbs) | 229 | if(dXAbs > dYAbs) |
| 230 | { | 230 | { |