diff options
author | Nivesh Rajbhandari | 2012-04-04 17:24:27 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-04-04 17:24:27 -0700 |
commit | 01cf259da7aaa7d70789d9a7c32111d88b477463 (patch) | |
tree | 0bff3395ac681e5f685d2267f7dbc03a8e32bc4a /js/tools/TagTool.js | |
parent | 331ea08655245e3532e48bf160d5f68a04d8723f (diff) | |
parent | 13368ca6ebbc13adeafccd898dfffd7ce37cb28a (diff) | |
download | ninja-01cf259da7aaa7d70789d9a7c32111d88b477463.tar.gz |
Merge branch 'refs/heads/ToolFixes' into WebGLMaterials
Conflicts:
js/document/templates/montage-html/default_html.css
js/mediators/element-mediator.js
js/panels/properties.reel/properties.js
js/tools/BrushTool.js
js/tools/LineTool.js
js/tools/PenTool.js
js/tools/SelectionTool.js
js/tools/ShapeTool.js
js/tools/TranslateObject3DTool.js
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/tools/TagTool.js')
-rwxr-xr-x | js/tools/TagTool.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/tools/TagTool.js b/js/tools/TagTool.js index 2b6742e6..f4b65c3e 100755 --- a/js/tools/TagTool.js +++ b/js/tools/TagTool.js | |||
@@ -90,7 +90,7 @@ exports.TagTool = Montage.create(DrawingTool, { | |||
90 | if(selectionManagerModule.selectionManager.isDocument) { | 90 | if(selectionManagerModule.selectionManager.isDocument) { |
91 | this.editSymbol = documentManagerModule.DocumentManager.activeDocument.documentRoot; | 91 | this.editSymbol = documentManagerModule.DocumentManager.activeDocument.documentRoot; |
92 | } else { | 92 | } else { |
93 | this.editSymbol = selectionManagerModule.selectionManager._selectedItems[0]._element; | 93 | this.editSymbol = selectionManagerModule.selectionManager._selectedItems[0]; |
94 | } | 94 | } |
95 | */ | 95 | */ |
96 | } | 96 | } |
@@ -104,7 +104,7 @@ exports.TagTool = Montage.create(DrawingTool, { | |||
104 | if(selectionManagerModule.selectionManager.isDocument) { | 104 | if(selectionManagerModule.selectionManager.isDocument) { |
105 | this.editSymbol = documentManagerModule.DocumentManager.activeDocument.documentRoot; | 105 | this.editSymbol = documentManagerModule.DocumentManager.activeDocument.documentRoot; |
106 | } else { | 106 | } else { |
107 | this.editSymbol = selectionManagerModule.selectionManager._selectedItems[0]._element; | 107 | this.editSymbol = selectionManagerModule.selectionManager._selectedItems[0]; |
108 | } | 108 | } |
109 | 109 | ||
110 | } | 110 | } |
@@ -142,7 +142,7 @@ exports.TagTool = Montage.create(DrawingTool, { | |||
142 | element = this.makeElement(~~data.width, ~~data.height, data.planeMat, data.midPt, this.makeTag()); | 142 | element = this.makeElement(~~data.width, ~~data.height, data.planeMat, data.midPt, this.makeTag()); |
143 | 143 | ||
144 | // Insert Element | 144 | // Insert Element |
145 | NJevent("elementAdding", element); | 145 | this.application.ninja.elementMediator.addElements(element.el, element.data); |
146 | } else { | 146 | } else { |
147 | element = this.makeStaticElement(this.makeTag()); | 147 | element = this.makeStaticElement(this.makeTag()); |
148 | this._insertStatic(this.editSymbol, element.el, element.style); | 148 | this._insertStatic(this.editSymbol, element.el, element.style); |