Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions client/components/form/input-checkbox-multiple.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/** External Dependencies **/
var React = require( 'react' ),
ReactDom = require( 'react-dom' ),
classNames = require( 'classnames' ),
forEach = require( 'lodash/forEach' ),
isArray = require( 'lodash/isArray' ),
Expand Down Expand Up @@ -70,9 +71,9 @@ module.exports = React.createClass( {
},

unHighlightAllSites: function( event ) {
var checked = $( React.findDOMNode( this.refs.allItems ) ).prop( 'checked' );
var checked = $( ReactDom.findDOMNode( this.refs.allItems ) ).prop( 'checked' );
if ( checked && ! event.target.checked ) {
$( React.findDOMNode( this.refs.allItems ) ).prop( 'checked', false );
$( ReactDom.findDOMNode( this.refs.allItems ) ).prop( 'checked', false );
}
},

Expand Down
4 changes: 3 additions & 1 deletion client/components/form/input-text.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/** External Dependencies **/
var React = require( 'react' ),
ReactDom = require( 'react-dom' ),
Formsy = require( 'formsy-react' ),
classNames = require( 'classnames' ),
Payment = require( 'payment' );
Expand All @@ -20,6 +21,7 @@ module.exports = React.createClass( {
description: React.PropTypes.string,
className: React.PropTypes.any,
style: React.PropTypes.any,
style: React.PropTypes.any,
floatingLabel: React.PropTypes.any,
label: React.PropTypes.any,
type: React.PropTypes.string,
Expand Down Expand Up @@ -60,7 +62,7 @@ module.exports = React.createClass( {
},

focus: function() {
React.findDOMNode( this.refs.input ).focus();
ReactDom.findDOMNode( this.refs.input ).focus();
},

getDefaultProps: function() {
Expand Down
3 changes: 2 additions & 1 deletion client/components/modal/index.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
var React = require( 'react' ),
ReactDom = require( 'react-dom' ),
Icon = require( '../icon' ),
classNames = require( 'classnames' ),
assign = require( 'lodash/assign' );
Expand Down Expand Up @@ -49,7 +50,7 @@ let Modal = React.createClass( {
jQuery( 'body' ).addClass( 'dops-modal-showing' );
jQuery( document ).keyup( this.handleEscapeKey );
try {
focusTrap.activate(this.getDOMNode(), {
focusTrap.activate( ReactDom.findDOMNode( this ), {
// onDeactivate: this.maybeClose,
initialFocus: this.props.initialFocus,
});
Expand Down
3 changes: 2 additions & 1 deletion client/components/my-sites-navigation/picker/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* External dependencies
*/
var React = require( 'react' ),
ReactDom = require( 'react-dom' ),
noop = require( 'lodash/noop' );

/**
Expand Down Expand Up @@ -36,7 +37,7 @@ module.exports = React.createClass( {
},

closePickerOnOutsideClick: function( event ) {
var pickerNode = React.findDOMNode( this.refs.siteSelector );
var pickerNode = ReactDom.findDOMNode( this.refs.siteSelector );

// If the picker is open & the user clicks outside of it, let's close it
if ( this.props.showingSites &&
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* External dependencies
*/
var React = require( 'react' ),
ReactDom = require( 'react-dom' ),
page = require( 'page' ),
noop = require( 'lodash/noop' ),
classNames = require( 'classnames' );
Expand Down Expand Up @@ -48,7 +49,7 @@ module.exports = React.createClass( {
},

doSearch: function() {
this.setState( { search: React.findDOMNode( this.refs.searchInput ).value } );
this.setState( { search: ReactDom.findDOMNode( this.refs.searchInput ).value } );
},

onSiteSelect: function( event ) {
Expand Down
5 changes: 4 additions & 1 deletion client/components/notice/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
line-height: 1.4285;
animation: appear .3s ease-in-out;

&::before{
@extend %dashicon;
}

.dops-notice__text {
flex-grow: 1;
flex-basis: 100px;
Expand All @@ -31,7 +35,6 @@
font-size: inherit;

&::before {
@extend %dashicon;
content: '\f534';
position: absolute;
top: 23px;
Expand Down
2 changes: 1 addition & 1 deletion client/lib/credit-card-details/validation.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ var creditcards = require( 'creditcards' ),
isArray = require( 'lodash/isArray' ),
isEmpty = require( 'lodash/isEmpty' ),
toArray = require( 'lodash/toArray' ),
inRange = require( 'lodash/number/inRange' ),
inRange = require( 'lodash/inRange' ),
capitalize = require( 'lodash/capitalize' );

/**
Expand Down
2 changes: 1 addition & 1 deletion client/lib/wpcom-undocumented/lib/undocumented.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
var debug = require( 'debug' )( 'calypso:wpcom-undocumented:undocumented' ),
isPlainObject = require( 'lodash/isPlainObject' ),
clone = require( 'lodash/clone' ),
omit = require( 'lodash/object/omit' ),
omit = require( 'lodash/omit' ),
camelCase = require( 'lodash/camelCase' ),
snakeCase = require( 'lodash/snakeCase' );

Expand Down
1 change: 1 addition & 0 deletions client/scss/calypso-form.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Below, you can choose from either using global form styles or class-driven
// form styles. By default, the global styles are on.
@import 'extends';

%form {
ul {
Expand Down