From 22a66cb6e243a3f1c867b62e3942fd2e828019d9 Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Thu, 8 Mar 2012 13:56:09 -0800 Subject: integrating v0.7 montage into ninja Signed-off-by: Valerio Virgillito --- node_modules/montage/ui/composer/press-composer.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'node_modules/montage/ui/composer/press-composer.js') diff --git a/node_modules/montage/ui/composer/press-composer.js b/node_modules/montage/ui/composer/press-composer.js index 942de162..4a6b99b2 100644 --- a/node_modules/montage/ui/composer/press-composer.js +++ b/node_modules/montage/ui/composer/press-composer.js @@ -103,7 +103,10 @@ var PressComposer = exports.PressComposer = Montage.create(Composer,/** @lends m _startInteraction: { enumerable: false, value: function(event) { - if ("disabled" in this.component && this.component.disabled) { + if ( + ("disabled" in this.component && this.component.disabled) || + this._observedPointer !== null + ) { return false; } @@ -401,8 +404,8 @@ var PressEvent = (function(){ // These properties are available directly on the event eventProps = ["altKey", "ctrlKey", "metaKey", "shiftKey", - "cancelBubble", "clipboardData", "currentTarget", "defaultPrevented", - "eventPhase", "returnValue", "srcElement", "timeStamp", "preventDefault", + "cancelBubble", "currentTarget", "defaultPrevented", + "eventPhase", "timeStamp", "preventDefault", "stopImmediatePropagation", "stopPropagation"]; // These properties are available on the event in the case of mouse, and // on the _touch in the case of touch -- cgit v1.2.3