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, 5 insertions, 0 deletions

diff --git a/js/panels/resize-composer.js b/js/panels/resize-composer.js
index 0d1774cd..2278623f 100644
--- a/js/panels/resize-composer.js
+++ b/js/panels/resize-composer.js
@@ -105,6 +105,8 @@ exports.ResizeComposer = Montage.create(Composer, {
     captureMouseup: {
         value: function(e) {
             e.preventDefault();
+            e.stopImmediatePropagation();
+            e.stopPropagation();
             window.removeEventListener("mousemove", this, true);
             window.removeEventListener("mouseup", this, true);
             this._executeEvent("resizeEnd");
@@ -113,6 +115,9 @@ exports.ResizeComposer = Montage.create(Composer, {
 
     captureMousemove: {
         value: function(e) {
+            e.preventDefault();
+            e.stopImmediatePropagation();
+            e.stopPropagation();
             if (this.xAxis) {
                 this._deltaX = e.clientX - this._startX;
             }