Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions composer/press-composer.js
Original file line number Diff line number Diff line change
Expand Up @@ -220,9 +220,14 @@ var PressComposer = exports.PressComposer = Composer.specialize(/** @lends Press
}
},

observedMouseButton: {
value: 0
},

_state: {
value: 0
},

state: {
get: function () {
return this._state;
Expand Down Expand Up @@ -521,11 +526,19 @@ var PressComposer = exports.PressComposer = Composer.specialize(/** @lends Press

captureMousedown: {
value: function (event) {
if (event.button === 0 && this._shouldPerformPress()) {
if ((
event.button === this.observedMouseButton ||
this.observedMouseButton === null
) && this._shouldPerformPress()
) {
this._observedPointer = "mouse";
this.component.eventManager.claimPointer(this._observedPointer, this);
this.component.eventManager.claimPointer(
this._observedPointer, this
);

if (this.component.eventManager.isPointerClaimedByComponent(this._observedPointer, this)) {
if (this.component.eventManager.isPointerClaimedByComponent(
this._observedPointer, this
)) {
this._addPointerDownListener();

} else{
Expand Down Expand Up @@ -989,4 +1002,3 @@ PressComposer.prototype.handleMSPointerDown = PressComposer.prototype._handlePoi
PressComposer.prototype.handlePointerdown = PressComposer.prototype._handlePointerDown;
PressComposer.prototype.handleMousedown = PressComposer.prototype._handlePointerDown;
PressComposer.prototype.handleTouchstart = PressComposer.prototype._handlePointerDown;

11 changes: 7 additions & 4 deletions core/gate.js
Original file line number Diff line number Diff line change
Expand Up @@ -191,12 +191,15 @@ var Gate = exports.Gate = Montage.specialize(/** @lends Gate.prototype # */ {
toString: {
value: function () {
var fieldNames = this._fields,
i,
iField,
result = "";
for (i = 0; (iField = fieldNames[i]); i++) {
result += iField + "[" + (this._value & fieldNames[iField]) + "], ";

if (fieldNames) {
var i, iField;
for (i = 0; (iField = fieldNames[i]); i++) {
result += iField + "[" + (this._value & fieldNames[iField]) + "], ";
}
}

return result;
}
}
Expand Down
1 change: 1 addition & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ <h4>Components:</h4>
<a href="ui/list.info/sample/index.html">List</a>
<a href="ui/list-item.info/sample/index.html">ListItem</a>
<a href="ui/number-field.info/sample/index.html">NumberField</a>
<a href="ui/overlay.info/sample/index.html">Overlay</a>
<a href="ui/placeholder.info/sample/index.html">Placeholder</a>
<a href="ui/radio.info/sample/index.html">Radio</a>
<a href="ui/repetition.info/sample/index.html">Repetition</a>
Expand Down
10 changes: 4 additions & 6 deletions test/spec/ui/modal-overlay-spec.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
/*global require,exports,describe,it,expect */
var Montage = require("montage").Montage,
ModalOverlay = require("montage/ui/modal-overlay.reel").ModalOverlay,
Promise = require("montage/core/promise").Promise,
MockDOM = require("mocks/dom"),
defaultEventManager = require("montage/core/event/event-manager").defaultEventManager;

describe("ui/modal-overlay-spec", function () {
Expand All @@ -13,14 +11,14 @@ describe("ui/modal-overlay-spec", function () {
defaultEventManager._activeTarget = null;
aModalOverlay = new ModalOverlay();
aModalOverlay.hasTemplate = false;
aModalOverlay.element = MockDOM.element();
aModalOverlay.modalMaskElement = MockDOM.element();
aModalOverlay.element = document.createElement('div');
aModalOverlay.modalMaskElement = document.createElement('div');
aModalOverlay.enterDocument(true);

anotherModalOverlay = new ModalOverlay();
anotherModalOverlay.hasTemplate = false;
anotherModalOverlay.element = MockDOM.element();
anotherModalOverlay.modalMaskElement = MockDOM.element();
anotherModalOverlay.element = document.createElement('div');
anotherModalOverlay.modalMaskElement = document.createElement('div');
anotherModalOverlay.enterDocument(true);

ModalOverlay.prototype._queue = [];
Expand Down
Loading