diff options
author | Jose Antonio Marquez | 2012-04-04 11:50:54 -0700 |
---|---|---|
committer | Jose Antonio Marquez | 2012-04-04 11:50:54 -0700 |
commit | 0a469a14757b8cea262c21f652e75c85c9903f4b (patch) | |
tree | c388fdc93e9707e7d66f51ef41eb1d9b366716c7 /js/tools/TagTool.js | |
parent | 6034e3aa1d033149ba9ca8f0578e0a95889a7e46 (diff) | |
parent | 8482e23cd9b8c4700b5130f2588e5eb24d376536 (diff) | |
download | ninja-0a469a14757b8cea262c21f652e75c85c9903f4b.tar.gz |
Merge branch 'refs/heads/Ninja-Internal' into FileIO
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 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); |