diff options
author | Jonathan Duran | 2012-04-04 11:21:46 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-04-04 11:21:46 -0700 |
commit | 04ca16276e73dbd238b42fd898f8b3cccc730f18 (patch) | |
tree | 95aee6605f1018550875812166d292554830d7ca /js/tools/TagTool.js | |
parent | 61404b1965ffe7011ec86953f853f0954ccc308d (diff) | |
parent | a11ef2eed7049835c8bdfa50a2b893632c46eaa0 (diff) | |
download | ninja-04ca16276e73dbd238b42fd898f8b3cccc730f18.tar.gz |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/tools/SelectionTool.js
Signed-off-by: Jonathan Duran <jduran@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 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); |