Merge branch 'refs/heads/master' into element-model-fixes

Conflicts:
	js/tools/LineTool.js
	js/tools/ShapeTool.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 8 insertions, 4 deletions

diff --git a/js/tools/TagTool.js b/js/tools/TagTool.js
index d56566cf..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;