diff options
author | Valerio Virgillito | 2012-06-11 17:03:16 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-06-11 17:03:16 -0700 |
commit | 6854a72504f57903bd5de003e377f2aefb02d0da (patch) | |
tree | 5dff803d67722595418e69f6cce9ec8a1a616f2f /js/tools/ShapeTool.js | |
parent | 756cbfad2b98b300af8db3793aa21718b88dd950 (diff) | |
parent | f4ad120c1a0d8594b8741eb1b07fdbd4fefcadeb (diff) | |
download | ninja-6854a72504f57903bd5de003e377f2aefb02d0da.tar.gz |
Merge pull request #288 from mencio/dom-container
Dom container - Fixing the current selected container
Diffstat (limited to 'js/tools/ShapeTool.js')
-rwxr-xr-x | js/tools/ShapeTool.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/tools/ShapeTool.js b/js/tools/ShapeTool.js index 03ddc391..8d381711 100755 --- a/js/tools/ShapeTool.js +++ b/js/tools/ShapeTool.js | |||
@@ -103,8 +103,8 @@ exports.ShapeTool = Montage.create(DrawingTool, { | |||
103 | if(wasSelected) { | 103 | if(wasSelected) { |
104 | this.AddCustomFeedback(); | 104 | this.AddCustomFeedback(); |
105 | this.application.ninja.elementMediator.addDelegate = this; | 105 | this.application.ninja.elementMediator.addDelegate = this; |
106 | if(this.application.ninja.currentSelectedContainer.nodeName === "CANVAS") { | 106 | if(this.application.ninja.currentDocument.model.domContainer.nodeName === "CANVAS") { |
107 | this._targetedElement = this.application.ninja.currentSelectedContainer; | 107 | this._targetedElement = this.application.ninja.currentDocument.model.domContainer; |
108 | } | 108 | } |
109 | } else { | 109 | } else { |
110 | this.RemoveCustomFeedback(); | 110 | this.RemoveCustomFeedback(); |
@@ -199,7 +199,7 @@ exports.ShapeTool = Montage.create(DrawingTool, { | |||
199 | target = this._targetedElement; | 199 | target = this._targetedElement; |
200 | else | 200 | else |
201 | { | 201 | { |
202 | var container = this.application.ninja.currentSelectedContainer; | 202 | var container = this.application.ninja.currentDocument.model.domContainer; |
203 | if (container && (container.nodeName === "CANVAS")) | 203 | if (container && (container.nodeName === "CANVAS")) |
204 | { | 204 | { |
205 | target = container; | 205 | target = container; |