diff options
author | hwc487 | 2012-04-04 16:32:53 -0700 |
---|---|---|
committer | hwc487 | 2012-04-04 16:32:53 -0700 |
commit | 6ee8b65742fbe61b4429dc8c7dc9ca33a3e43600 (patch) | |
tree | f267e05f623ed90d1cc841b8c79a338d6d8e807c /js/tools/TagTool.js | |
parent | 16f62ca09cc428043e8fef8bdeea11a989e62bc0 (diff) | |
parent | 17ca01f54591187f5c0812c0fd2cb7260afa9639 (diff) | |
download | ninja-6ee8b65742fbe61b4429dc8c7dc9ca33a3e43600.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Snapping
Conflicts:
js/panels/presets/animations-presets.reel/animations-presets.js
js/panels/presets/style-presets.reel/style-presets.js
js/panels/presets/transitions-presets.reel/transitions-presets.js
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); |