Merge branch 'refs/heads/TimelineUberjd' into TimelineUber

Conflicts:
	js/controllers/elements/element-controller.js
	js/document/_toDelete/html-document.js
	js/panels/Timeline/Layer.reel/Layer.js

Signed-off-by: Kruti Shah <kruti.shah@motorola.com>

1 files changed, 8 insertions, 7 deletions

diff --git a/js/tools/TagTool.js b/js/tools/TagTool.js
index 5520fa89..508e2a85 100755
--- a/js/tools/TagTool.js
+++ b/js/tools/TagTool.js
@@ -51,16 +51,20 @@ exports.TagTool = Montage.create(DrawingTool, {
 
     HandleLeftButtonUp: {
         value: function(event) {
+            var w, h;
             if(this._escape) {
                 this._escape = false;
                 return;
             }
 
             if(this._hasDraw) {
-                var drawData =  this.getDrawingData();
-
-                if(drawData) {
-                    this.insertElement(drawData);
+                this.drawData = this.getDrawingData();
+                if(this.drawData) {
+                    w = Math.floor(this.drawData.width);
+                    h = Math.floor(this.drawData.height);
+                    if( (w > 0) && (h > 0) ) {
+                        this.insertElement(this.drawData);
+                    }
                 }
 
                 this._hasDraw = false;
@@ -86,9 +90,6 @@ exports.TagTool = Montage.create(DrawingTool, {
                 element = document.application.njUtils.make(this.options.selectedElement, null, this.application.ninja.currentDocument);
             }
 
-            // Create the model
-            document.application.njUtils.createModel(element);
-
             // Create the styles
             styles = document.application.njUtils.stylesFromDraw(element, ~~drawData.width, ~~drawData.height, drawData);