aboutsummaryrefslogtreecommitdiff
path: root/js/tools/TagTool.js
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-04-04 11:51:08 -0700
committerJose Antonio Marquez2012-04-04 11:51:08 -0700
commite2ed78b699c3f2353bdf636629956c2a3ef319be (patch)
treeb9b2f9e175b710f9b37b17b470587a5af43075d2 /js/tools/TagTool.js
parentbc04ee998de7aaadc457f4e932cc4be8327a2a03 (diff)
parent8482e23cd9b8c4700b5130f2588e5eb24d376536 (diff)
downloadninja-e2ed78b699c3f2353bdf636629956c2a3ef319be.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/tools/TagTool.js')
-rwxr-xr-xjs/tools/TagTool.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/tools/TagTool.js b/js/tools/TagTool.js
index e3f49bbe..5512165e 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);