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/InkBottleTool.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/InkBottleTool.js')
-rwxr-xr-x | js/tools/InkBottleTool.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/js/tools/InkBottleTool.js b/js/tools/InkBottleTool.js index 3762641b..d8f06204 100755 --- a/js/tools/InkBottleTool.js +++ b/js/tools/InkBottleTool.js | |||
@@ -33,13 +33,13 @@ var Montage = require("montage/core/core").Montage, | |||
33 | ElementsMediator = require("js/mediators/element-mediator").ElementMediator; | 33 | ElementsMediator = require("js/mediators/element-mediator").ElementMediator; |
34 | 34 | ||
35 | exports.InkBottleTool = Montage.create(ModifierToolBase, { | 35 | exports.InkBottleTool = Montage.create(ModifierToolBase, { |
36 | _canSnap: { value: false }, | 36 | _canSnap: { value: false }, |
37 | _canColor: { value: true }, | 37 | _canColor: { value: true }, |
38 | _targetedElement: { value: null }, | 38 | _targetedElement: { value: null }, |
39 | 39 | ||
40 | HandleMouseMove: { | 40 | HandleMouseMove: { |
41 | value : function (event) | 41 | value : function (event) |
42 | { | 42 | { |
43 | var obj = this.application.ninja.stage.getElement(event, true); | 43 | var obj = this.application.ninja.stage.getElement(event, true); |
44 | var cursor = "url('images/cursors/ink.png') 6 11, default"; | 44 | var cursor = "url('images/cursors/ink.png') 6 11, default"; |
45 | var canColor = true; | 45 | var canColor = true; |
@@ -72,13 +72,13 @@ exports.InkBottleTool = Montage.create(ModifierToolBase, { | |||
72 | } | 72 | } |
73 | this.application.ninja.stage.drawingCanvas.style.cursor = cursor; | 73 | this.application.ninja.stage.drawingCanvas.style.cursor = cursor; |
74 | this._canColor = canColor; | 74 | this._canColor = canColor; |
75 | } | 75 | } |
76 | }, | 76 | }, |
77 | 77 | ||
78 | HandleLeftButtonUp: { | 78 | HandleLeftButtonUp: { |
79 | value : function () { | 79 | value : function () { |
80 | //if(this._isDrawing) | 80 | //if(this._isDrawing) |
81 | { | 81 | { |
82 | this.application.ninja.stage.clearDrawingCanvas(); | 82 | this.application.ninja.stage.clearDrawingCanvas(); |
83 | this._hasDraw = false; | 83 | this._hasDraw = false; |
84 | this._isDrawing = false; | 84 | this._isDrawing = false; |