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

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, {
             if(selectionManagerModule.selectionManager.isDocument) {
                 this.editSymbol = documentManagerModule.DocumentManager.activeDocument.documentRoot;
             } else {
-                this.editSymbol = selectionManagerModule.selectionManager._selectedItems[0]._element;
+                this.editSymbol = selectionManagerModule.selectionManager._selectedItems[0];
             }
             */
         }
@@ -104,7 +104,7 @@ exports.TagTool = Montage.create(DrawingTool, {
                 if(selectionManagerModule.selectionManager.isDocument) {
                     this.editSymbol = documentManagerModule.DocumentManager.activeDocument.documentRoot;
                 } else {
-                    this.editSymbol = selectionManagerModule.selectionManager._selectedItems[0]._element;
+                    this.editSymbol = selectionManagerModule.selectionManager._selectedItems[0];
                 }
 
             }
@@ -142,7 +142,7 @@ exports.TagTool = Montage.create(DrawingTool, {
                 element = this.makeElement(~~data.width, ~~data.height, data.planeMat, data.midPt, this.makeTag());
 
                 // Insert Element
-                NJevent("elementAdding", element);
+                this.application.ninja.elementMediator.addElements(element.el, element.data);
             } else {
                 element = this.makeStaticElement(this.makeTag());
                 this._insertStatic(this.editSymbol, element.el, element.style);