diff options
author | hwc487 | 2012-07-09 16:08:02 -0700 |
---|---|---|
committer | hwc487 | 2012-07-09 16:08:02 -0700 |
commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/tools/EyedropperTool.js | |
parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/tools/EyedropperTool.js')
-rwxr-xr-x | js/tools/EyedropperTool.js | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/js/tools/EyedropperTool.js b/js/tools/EyedropperTool.js index e9831d71..452c46d1 100755 --- a/js/tools/EyedropperTool.js +++ b/js/tools/EyedropperTool.js | |||
@@ -49,20 +49,20 @@ exports.EyedropperTool = Montage.create(toolBase, { | |||
49 | 49 | ||
50 | Configure: { | 50 | Configure: { |
51 | value: function ( doActivate ) | 51 | value: function ( doActivate ) |
52 | { | 52 | { |
53 | if (doActivate) | 53 | if (doActivate) |
54 | { | 54 | { |
55 | NJevent("enableStageMove"); | 55 | NJevent("enableStageMove"); |
56 | } | 56 | } |
57 | else | 57 | else |
58 | { | 58 | { |
59 | NJevent("disableStageMove"); | 59 | NJevent("disableStageMove"); |
60 | this._deleteImageDataCanvas(); | 60 | this._deleteImageDataCanvas(); |
61 | this._isMouseDown = false; | 61 | this._isMouseDown = false; |
62 | this._elementUnderMouse = null; | 62 | this._elementUnderMouse = null; |
63 | this._previousColor = null; | 63 | this._previousColor = null; |
64 | this._color = null; | 64 | this._color = null; |
65 | } | 65 | } |
66 | } | 66 | } |
67 | }, | 67 | }, |
68 | 68 | ||
@@ -78,7 +78,7 @@ exports.EyedropperTool = Montage.create(toolBase, { | |||
78 | 78 | ||
79 | HandleMouseMove: { | 79 | HandleMouseMove: { |
80 | value : function (event) | 80 | value : function (event) |
81 | { | 81 | { |
82 | if(this._escape) | 82 | if(this._escape) |
83 | { | 83 | { |
84 | this._isMouseDown = false; | 84 | this._isMouseDown = false; |
@@ -90,12 +90,12 @@ exports.EyedropperTool = Montage.create(toolBase, { | |||
90 | { | 90 | { |
91 | this._updateColorFromPoint(event); | 91 | this._updateColorFromPoint(event); |
92 | } | 92 | } |
93 | } | 93 | } |
94 | }, | 94 | }, |
95 | 95 | ||
96 | HandleLeftButtonUp: { | 96 | HandleLeftButtonUp: { |
97 | value : function (event) { | 97 | value : function (event) { |
98 | { | 98 | { |
99 | this._isMouseDown = false; | 99 | this._isMouseDown = false; |
100 | 100 | ||
101 | if(this._escape) | 101 | if(this._escape) |