diff options
author | Pushkar Joshi | 2012-03-12 15:26:10 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-03-12 15:26:10 -0700 |
commit | 46b2e561fa6ca054cad58e4c372a598bbb7ee2c9 (patch) | |
tree | 38d1c8666098a10078834c1eaac3d455135bee12 /node_modules/montage/ui/composer/press-composer.js | |
parent | 7b4b068cadc0af8ec7e930e1c2b429e945f96984 (diff) | |
parent | 69d90467865a1384725b2301901be2180c5a841f (diff) | |
download | ninja-46b2e561fa6ca054cad58e4c372a598bbb7ee2c9.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'node_modules/montage/ui/composer/press-composer.js')
-rw-r--r-- | node_modules/montage/ui/composer/press-composer.js | 9 |
1 files changed, 6 insertions, 3 deletions
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 | |||
103 | _startInteraction: { | 103 | _startInteraction: { |
104 | enumerable: false, | 104 | enumerable: false, |
105 | value: function(event) { | 105 | value: function(event) { |
106 | if ("disabled" in this.component && this.component.disabled) { | 106 | if ( |
107 | ("disabled" in this.component && this.component.disabled) || | ||
108 | this._observedPointer !== null | ||
109 | ) { | ||
107 | return false; | 110 | return false; |
108 | } | 111 | } |
109 | 112 | ||
@@ -401,8 +404,8 @@ var PressEvent = (function(){ | |||
401 | 404 | ||
402 | // These properties are available directly on the event | 405 | // These properties are available directly on the event |
403 | eventProps = ["altKey", "ctrlKey", "metaKey", "shiftKey", | 406 | eventProps = ["altKey", "ctrlKey", "metaKey", "shiftKey", |
404 | "cancelBubble", "clipboardData", "currentTarget", "defaultPrevented", | 407 | "cancelBubble", "currentTarget", "defaultPrevented", |
405 | "eventPhase", "returnValue", "srcElement", "timeStamp", "preventDefault", | 408 | "eventPhase", "timeStamp", "preventDefault", |
406 | "stopImmediatePropagation", "stopPropagation"]; | 409 | "stopImmediatePropagation", "stopPropagation"]; |
407 | // These properties are available on the event in the case of mouse, and | 410 | // These properties are available on the event in the case of mouse, and |
408 | // on the _touch in the case of touch | 411 | // on the _touch in the case of touch |