Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal

Conflicts:
	css/ninja.css
	js/stage/stage.reel/stage.html
	js/tools/TextTool.js
	node_modules/labs/rich-text-editor.reel/rich-text-editor.css
	node_modules/labs/rich-text-editor.reel/rich-text-editor.html
	node_modules/labs/rich-text-editor.reel/rich-text-editor.js
	node_modules/labs/rich-text-editor.reel/rich-text-resizer.js
	node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 13 insertions, 11 deletions

diff --git a/node_modules/montage/ui/composer/swipe-composer.js b/node_modules/montage/ui/composer/swipe-composer.js
index 4eb9ee3b..2d9fe266 100644
--- a/node_modules/montage/ui/composer/swipe-composer.js
+++ b/node_modules/montage/ui/composer/swipe-composer.js
@@ -208,17 +208,19 @@ exports.SwipeComposer = Montage.create(Composer, /** @lends module:montage/ui/co
                 }
             }
 
-            swipeEvent = document.createEvent("CustomEvent");
-            swipeEvent.initCustomEvent("swipemove", true, false, null);
-            swipeEvent.direction = direction;
-            swipeEvent.angle = this._startSwipeAngle;
-            swipeEvent.velocity = this._findVelocity((event.timeStamp - this._startTimestamp));
-            swipeEvent.startX = this._startX;
-            swipeEvent.startY = this._startY;
-            swipeEvent.dX = this._deltaX;
-            swipeEvent.dY = this._deltaY;
-
-            this.dispatchEvent(swipeEvent);
+            if (dX != 0 || dY != 0) {
+                swipeEvent = document.createEvent("CustomEvent");
+                swipeEvent.initCustomEvent("swipemove", true, false, null);
+                swipeEvent.direction = direction;
+                swipeEvent.angle = this._startSwipeAngle;
+                swipeEvent.velocity = this._findVelocity((event.timeStamp - this._startTimestamp));
+                swipeEvent.startX = this._startX;
+                swipeEvent.startY = this._startY;
+                swipeEvent.dX = this._deltaX;
+                swipeEvent.dY = this._deltaY;
+
+                this.dispatchEvent(swipeEvent);
+            }
         }
     },