Skip to content

Commit

Permalink
Merge pull request #488 from BobertForever/WebkitTapHighlightColor-wa…
Browse files Browse the repository at this point in the history
…rning

Fixed WebkitTapHighlightColor warning in console
  • Loading branch information
mmrtnz committed Apr 1, 2015
2 parents d13b9fc + 236d7a2 commit 35cea57
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion src/js/date-picker/day-button.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ var DayButton = React.createClass({
var styles = {
root: {
boxSizing: 'border-box',
webkitTapHighlightColor: 'rgba(0,0,0,0)',
WebkitTapHighlightColor: 'rgba(0,0,0,0)',
position: 'relative',
float: 'left',
width: 36,
Expand Down
36 changes: 18 additions & 18 deletions src/js/dialog-window.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ var DialogWindow = React.createClass({
var style = {
position: 'fixed',
boxSizing: 'border-box',
webkitTapHighlightColor: 'rgba(0,0,0,0)',
WebkitTapHighlightColor: 'rgba(0,0,0,0)',
zIndex: 10,
top: 0,
left: -10000,
Expand All @@ -78,9 +78,9 @@ var DialogWindow = React.createClass({
},

_contents: function() {
var style = {
var style = {
boxSizing: 'border-box',
webkitTapHighlightColor: 'rgba(0,0,0,0)',
WebkitTapHighlightColor: 'rgba(0,0,0,0)',
transition: Transitions.easeOut(),
position: 'relative',
width: '75%',
Expand Down Expand Up @@ -148,7 +148,7 @@ var DialogWindow = React.createClass({
key={key}
secondary={true}
onClick={onClickHandler}
label={actionJSON.text}
label={actionJSON.text}
style={styles}/>
);
},
Expand All @@ -158,7 +158,7 @@ var DialogWindow = React.createClass({
var actionObjects = [];
var actionStyle = {
boxSizing: 'border-box',
webkitTapHighlightColor: 'rgba(0,0,0,0)',
WebkitTapHighlightColor: 'rgba(0,0,0,0)',
padding: 8,
marginBottom: 8,
width: '100%',
Expand Down Expand Up @@ -187,30 +187,30 @@ var DialogWindow = React.createClass({
return actionContainer;
},

_positionDialog: function() {
_positionDialog: function() {

var container = this.getDOMNode();
var dialogWindow = this.refs.dialogWindow.getDOMNode();
var dialogWindow = this.refs.dialogWindow.getDOMNode();
var containerHeight = container.offsetHeight;

//Reset the height in case the window was resized.
dialogWindow.style.height = '';
var dialogWindowHeight = dialogWindow.offsetHeight;

var paddingTop = ((containerHeight - dialogWindowHeight) / 2) - 64;
//Reset the height in case the window was resized.
dialogWindow.style.height = '';
var dialogWindowHeight = dialogWindow.offsetHeight;

var paddingTop = ((containerHeight - dialogWindowHeight) / 2) - 64;

//Vertically center the dialog window, but make sure it doesn't
//transition to that position.
if (this.props.repositionOnUpdate || !container.style.paddingTop) {
//Vertically center the dialog window, but make sure it doesn't
//transition to that position.
if (this.props.repositionOnUpdate || !container.style.paddingTop) {
container.style.paddingTop = paddingTop + 'px';
}

},

_onShow: function() {
if (this.props.onShow) this.props.onShow();
},

_onDismiss: function() {
if (this.props.onDismiss) this.props.onDismiss();
},
Expand Down
4 changes: 2 additions & 2 deletions src/js/paper.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var Paper = React.createClass({
return this.mergeAndPrefix({
boxSizing: 'border-box',
fontFamily: CustomVariables.contentFontFamily,
webkitTapHighlightColor: 'rgba(0,0,0,0)',
WebkitTapHighlightColor: 'rgba(0,0,0,0)',
boxShadow: this.getZDepthShadows(this.props.zDepth).boxShadow,
borderRadius: this.props.circle ? '50%' :
this.props.rounded ? '2px' :
Expand All @@ -42,7 +42,7 @@ var Paper = React.createClass({
height: '100%',
boxSizing: 'border-box',
fontFamily: CustomVariables.contentFontFamily,
webkitTapHighlightColor: 'rgba(0,0,0,0)',
WebkitTapHighlightColor: 'rgba(0,0,0,0)',
boxShadow: this.getZDepthShadows(this.props.zDepth).bottomBoxShadow,
borderRadius: this.props.circle ? '50%' :
this.props.rounded ? '2px' :
Expand Down
2 changes: 1 addition & 1 deletion src/js/text-field.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ var TextField = React.createClass({
_input: function() {
var style = {
boxSizing: 'border-box',
webkitTapHighlightColor: 'rgba(0,0,0,0)',
WebkitTapHighlightColor: 'rgba(0,0,0,0)',
position: 'relative',
width: '100%',
height: '100%',
Expand Down
2 changes: 1 addition & 1 deletion src/js/toolbar/toolbar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var Toolbar = React.createClass({
_main: function() {
return this.mergeAndPrefix({
boxSizing: 'border-box',
webkitTapHighlightColor: 'rgba(0,0,0,0)',
WebkitTapHighlightColor: 'rgba(0,0,0,0)',
backgroundColor: CustomVariables.toolbarBackgroundColor,
height: CustomVariables.toolbarHeight,
width: '100%',
Expand Down

0 comments on commit 35cea57

Please sign in to comment.