Skip to content

Commit 35cea57

Browse files
committed
Merge pull request #488 from BobertForever/WebkitTapHighlightColor-warning
Fixed WebkitTapHighlightColor warning in console
2 parents d13b9fc + 236d7a2 commit 35cea57

File tree

5 files changed

+23
-23
lines changed

5 files changed

+23
-23
lines changed

src/js/date-picker/day-button.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ var DayButton = React.createClass({
2727
var styles = {
2828
root: {
2929
boxSizing: 'border-box',
30-
webkitTapHighlightColor: 'rgba(0,0,0,0)',
30+
WebkitTapHighlightColor: 'rgba(0,0,0,0)',
3131
position: 'relative',
3232
float: 'left',
3333
width: 36,

src/js/dialog-window.jsx

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ var DialogWindow = React.createClass({
5858
var style = {
5959
position: 'fixed',
6060
boxSizing: 'border-box',
61-
webkitTapHighlightColor: 'rgba(0,0,0,0)',
61+
WebkitTapHighlightColor: 'rgba(0,0,0,0)',
6262
zIndex: 10,
6363
top: 0,
6464
left: -10000,
@@ -78,9 +78,9 @@ var DialogWindow = React.createClass({
7878
},
7979

8080
_contents: function() {
81-
var style = {
81+
var style = {
8282
boxSizing: 'border-box',
83-
webkitTapHighlightColor: 'rgba(0,0,0,0)',
83+
WebkitTapHighlightColor: 'rgba(0,0,0,0)',
8484
transition: Transitions.easeOut(),
8585
position: 'relative',
8686
width: '75%',
@@ -148,7 +148,7 @@ var DialogWindow = React.createClass({
148148
key={key}
149149
secondary={true}
150150
onClick={onClickHandler}
151-
label={actionJSON.text}
151+
label={actionJSON.text}
152152
style={styles}/>
153153
);
154154
},
@@ -158,7 +158,7 @@ var DialogWindow = React.createClass({
158158
var actionObjects = [];
159159
var actionStyle = {
160160
boxSizing: 'border-box',
161-
webkitTapHighlightColor: 'rgba(0,0,0,0)',
161+
WebkitTapHighlightColor: 'rgba(0,0,0,0)',
162162
padding: 8,
163163
marginBottom: 8,
164164
width: '100%',
@@ -187,30 +187,30 @@ var DialogWindow = React.createClass({
187187
return actionContainer;
188188
},
189189

190-
_positionDialog: function() {
190+
_positionDialog: function() {
191191

192192
var container = this.getDOMNode();
193-
var dialogWindow = this.refs.dialogWindow.getDOMNode();
193+
var dialogWindow = this.refs.dialogWindow.getDOMNode();
194194
var containerHeight = container.offsetHeight;
195-
196-
//Reset the height in case the window was resized.
197-
dialogWindow.style.height = '';
198-
var dialogWindowHeight = dialogWindow.offsetHeight;
199195

200-
var paddingTop = ((containerHeight - dialogWindowHeight) / 2) - 64;
196+
//Reset the height in case the window was resized.
197+
dialogWindow.style.height = '';
198+
var dialogWindowHeight = dialogWindow.offsetHeight;
199+
200+
var paddingTop = ((containerHeight - dialogWindowHeight) / 2) - 64;
201201

202-
//Vertically center the dialog window, but make sure it doesn't
203-
//transition to that position.
204-
if (this.props.repositionOnUpdate || !container.style.paddingTop) {
202+
//Vertically center the dialog window, but make sure it doesn't
203+
//transition to that position.
204+
if (this.props.repositionOnUpdate || !container.style.paddingTop) {
205205
container.style.paddingTop = paddingTop + 'px';
206206
}
207-
207+
208208
},
209-
209+
210210
_onShow: function() {
211211
if (this.props.onShow) this.props.onShow();
212212
},
213-
213+
214214
_onDismiss: function() {
215215
if (this.props.onDismiss) this.props.onDismiss();
216216
},

src/js/paper.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ var Paper = React.createClass({
2828
return this.mergeAndPrefix({
2929
boxSizing: 'border-box',
3030
fontFamily: CustomVariables.contentFontFamily,
31-
webkitTapHighlightColor: 'rgba(0,0,0,0)',
31+
WebkitTapHighlightColor: 'rgba(0,0,0,0)',
3232
boxShadow: this.getZDepthShadows(this.props.zDepth).boxShadow,
3333
borderRadius: this.props.circle ? '50%' :
3434
this.props.rounded ? '2px' :
@@ -42,7 +42,7 @@ var Paper = React.createClass({
4242
height: '100%',
4343
boxSizing: 'border-box',
4444
fontFamily: CustomVariables.contentFontFamily,
45-
webkitTapHighlightColor: 'rgba(0,0,0,0)',
45+
WebkitTapHighlightColor: 'rgba(0,0,0,0)',
4646
boxShadow: this.getZDepthShadows(this.props.zDepth).bottomBoxShadow,
4747
borderRadius: this.props.circle ? '50%' :
4848
this.props.rounded ? '2px' :

src/js/text-field.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ var TextField = React.createClass({
124124
_input: function() {
125125
var style = {
126126
boxSizing: 'border-box',
127-
webkitTapHighlightColor: 'rgba(0,0,0,0)',
127+
WebkitTapHighlightColor: 'rgba(0,0,0,0)',
128128
position: 'relative',
129129
width: '100%',
130130
height: '100%',

src/js/toolbar/toolbar.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var Toolbar = React.createClass({
1414
_main: function() {
1515
return this.mergeAndPrefix({
1616
boxSizing: 'border-box',
17-
webkitTapHighlightColor: 'rgba(0,0,0,0)',
17+
WebkitTapHighlightColor: 'rgba(0,0,0,0)',
1818
backgroundColor: CustomVariables.toolbarBackgroundColor,
1919
height: CustomVariables.toolbarHeight,
2020
width: '100%',

0 commit comments

Comments
 (0)