Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TIMOB-8195] Updated controls so that non-TI controls don't receive touc... #1803

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion mobileweb/titanium/Ti/UI/ActivityIndicator.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ define(["Ti/_/declare", "Ti/_/lang", "Ti/_/UI/FontWidget", "Ti/_/dom", "Ti/_/sty
style: {
transform: "translate(16px,0px) rotate(" + i * 30 + "deg)",
transformOrigin: "2px 18px",
opacity: opacity
opacity: opacity,
pointerEvents: "none"
}
}, this._indicatorIndicator));
}
Expand Down
8 changes: 6 additions & 2 deletions mobileweb/titanium/Ti/UI/Label.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,17 @@ define(["Ti/_/declare", "Ti/_/UI/FontWidget", "Ti/_/dom", "Ti/_/css", "Ti/_/styl
style: {
display: ["-webkit-box", "-moz-box"],
boxOrient: "vertical",
boxPack: "center"
boxPack: "center",
pointerEvents: "none"
}
}, this.domNode);

// Create the container div. This gets floated by the flexbox
this.textContainerDiv = dom.create("div", {
className: css.clean("TiUILabelTextContainer")
className: css.clean("TiUILabelTextContainer"),
style: {
pointerEvents: "none"
}
}, aligner);

this._addStyleableDomNode(this.textContainerDiv);
Expand Down
6 changes: 4 additions & 2 deletions mobileweb/titanium/Ti/UI/Picker.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ define(["Ti/_/declare", "Ti/UI/View", "Ti/_/UI/Widget", "Ti/UI", "Ti/_/lang", "T
top: unitizedBorderRadius,
right: unitizedBorderRadius,
bottom: unitizedBorderRadius,
position: "absolute"
position: "absolute",
pointerEvents: "none"
}
}, this.domNode);
var currentValue = this._input.value,
Expand Down Expand Up @@ -81,7 +82,8 @@ define(["Ti/_/declare", "Ti/UI/View", "Ti/_/UI/Widget", "Ti/UI", "Ti/_/lang", "T
var inputRuler = dom.create("input", {
style: {
height: "auto",
width: "auto"
width: "auto",
pointerEvents: "none"
}
}, document.body);

Expand Down
5 changes: 3 additions & 2 deletions mobileweb/titanium/Ti/UI/PickerColumn.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ define(["Ti/_/declare", "Ti/_/UI/FontWidget", "Ti/_/dom", "Ti/UI", "Ti/_/style",
height: "1em",
width: "100%",
marginTop: "-0.5em",
textAlign: "center"
textAlign: "center",
pointerEvents: "none"
}
}, this.domNode);
this._addStyleableDomNode(titleContainer);
Expand Down Expand Up @@ -148,7 +149,7 @@ define(["Ti/_/declare", "Ti/_/UI/FontWidget", "Ti/_/dom", "Ti/UI", "Ti/_/style",
width: "100%",
borderTop: "1px solid #666",
fontSize: "28px",
cursor: "pointer"
cursor: "pointer"
}
}, this.domNode);
downArrow.innerHTML = "\u2228";
Expand Down
10 changes: 8 additions & 2 deletions mobileweb/titanium/Ti/UI/Slider.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,17 @@ define(["Ti/_/declare", "Ti/_/UI/Widget", "Ti/_/dom", "Ti/_/css", "Ti/_/style",

constructor: function(args) {
this._track = dom.create("div", {
className: "TiUISliderTrack"
className: "TiUISliderTrack",
style: {
pointerEvents: "none"
}
}, this.domNode);

this._thumb = dom.create("div", {
className: "TiUIElementGradient TiUISliderThumb"
className: "TiUIElementGradient TiUISliderThumb",
style: {
pointerEvents: "none"
}
}, this.domNode);

var initialPosition,
Expand Down
15 changes: 10 additions & 5 deletions mobileweb/titanium/Ti/UI/Switch.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ define(["Ti/_/declare", "Ti/_/UI/FontWidget", "Ti/_/dom", "Ti/_/css", "Ti/_/styl
boxPack: "center",
boxAlign: "stretch",
width: "100%",
height: "100%"
height: "100%",
pointerEvents: "none"
}
}, this.domNode)

Expand All @@ -32,15 +33,17 @@ define(["Ti/_/declare", "Ti/_/UI/FontWidget", "Ti/_/dom", "Ti/_/css", "Ti/_/styl
boxOrient: "vertical",
boxPack: "center",
boxAlign: "center",
boxFlex: 1
boxFlex: 1,
pointerEvents: "none"
}
}, this._contentContainer);
this._switchTitle = dom.create("div", {
className: "TiUISwitchTitle",
style: {
whiteSpace: "nowrap",
pointerEvents: "none",
textAlign: "center"
textAlign: "center",
pointerEvents: "none"
}
}, this._titleContainer);
this._addStyleableDomNode(this._switchTitle);
Expand All @@ -52,7 +55,8 @@ define(["Ti/_/declare", "Ti/_/UI/FontWidget", "Ti/_/dom", "Ti/_/css", "Ti/_/styl
display: ["-webkit-box", "-moz-box"],
boxPack: "center",
boxAlign: "center",
marginTop: "3px"
marginTop: "3px",
pointerEvents: "none"
}
}, this._contentContainer);
this._switchIndicator = dom.create("div", {
Expand All @@ -62,7 +66,8 @@ define(["Ti/_/declare", "Ti/_/UI/FontWidget", "Ti/_/dom", "Ti/_/css", "Ti/_/styl
borderRadius: "4px",
border: "1px solid #888",
pointerEvents: "none",
width: "40px"
width: "40px",
pointerEvents: "none"
}
}, this._indicatorContainer);
this._switchIndicator.domNode += " TiUISwitchIndicator";
Expand Down
8 changes: 6 additions & 2 deletions mobileweb/titanium/Ti/UI/Tab.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,16 @@ define(["Ti/_/declare", "Ti/UI/View", "Ti/_/dom", "Ti/Locale", "Ti/UI"],
display: ["-webkit-box", "-moz-box"],
boxOrient: "horizontal",
boxPack: "center",
boxAlign: "center"
boxAlign: "center",
pointerEvents: "none"
}
}, this.domNode);

this._tabIcon = dom.create("img", {
className: "TiUITabImage"
className: "TiUITabImage",
style: {
pointerEvents: "none"
}
}, container);

this._tabTitle = dom.create("div", {
Expand Down
6 changes: 4 additions & 2 deletions mobileweb/titanium/Ti/UI/View.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ define(["Ti/_/declare", "Ti/_/dom", "Ti/_/UI/Element", "Ti/_/lang", "Ti/_/string
borderRadius: "3px",
height: "0px",
bottom: "0px",
opacity: 0
opacity: 0,
pointerEvents: "none"
}
}, this.domNode);
},
Expand All @@ -72,7 +73,8 @@ define(["Ti/_/declare", "Ti/_/dom", "Ti/_/UI/Element", "Ti/_/lang", "Ti/_/string
borderRadius: "3px",
width: "0px",
right: "0px",
opacity: 0
opacity: 0,
pointerEvents: "none"
}
}, this.domNode);
},
Expand Down