aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage/ui/composer/press-composer.js
diff options
context:
space:
mode:
Diffstat (limited to 'node_modules/montage/ui/composer/press-composer.js')
-rw-r--r--node_modules/montage/ui/composer/press-composer.js9
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