Merge remote-tracking branch 'upstream/master' into PLT-637

Conflicts:
	web/react/utils/constants.jsx

web/react/components/user_settings/import_theme_modal.jsx

@@ -35,7 +35,7 @@ export default class ImportThemeModal extends React.Component {
     handleSubmit(e) {
         e.preventDefault();
 
-        const text = React.findDOMNode(this.refs.input).value;
+        const text = ReactDOM.findDOMNode(this.refs.input).value;
 
         if (!this.isInputValid(text)) {
             this.setState({inputError: 'Invalid format, please try copying and pasting in again.'});

web/react/components/user_settings/user_settings_appearance.jsx

@@ -29,14 +29,14 @@ export default class UserSettingsAppearance extends React.Component {
         UserStore.addChangeListener(this.onChange);
 
         if (this.props.activeSection === 'theme') {
-            $(React.findDOMNode(this.refs[this.state.theme])).addClass('active-border');
+            $(ReactDOM.findDOMNode(this.refs[this.state.theme])).addClass('active-border');
         }
         $('#user_settings').on('hidden.bs.modal', this.handleClose);
     }
     componentDidUpdate() {
         if (this.props.activeSection === 'theme') {
             $('.color-btn').removeClass('active-border');
-            $(React.findDOMNode(this.refs[this.state.theme])).addClass('active-border');
+            $(ReactDOM.findDOMNode(this.refs[this.state.theme])).addClass('active-border');
         }
     }
     componentWillUnmount() {

web/react/components/user_settings/user_settings_general.jsx

@@ -211,7 +211,7 @@ export default class UserSettingsGeneralTab extends React.Component {
         this.props.updateSection(section);
     }
     handleClose() {
-        $(React.findDOMNode(this)).find('.form-control').each(function clearForms() {
+        $(ReactDOM.findDOMNode(this)).find('.form-control').each(function clearForms() {
             this.value = '';
         });
 

web/react/components/user_settings/user_settings_notifications.jsx

@@ -129,7 +129,7 @@ export default class NotificationsTab extends React.Component {
         );
     }
     handleClose() {
-        $(React.findDOMNode(this)).find('.form-control').each(function clearField() {
+        $(ReactDOM.findDOMNode(this)).find('.form-control').each(function clearField() {
             this.value = '';
         });
 
@@ -158,15 +158,15 @@ export default class NotificationsTab extends React.Component {
     }
     handleNotifyRadio(notifyLevel) {
         this.setState({notifyLevel: notifyLevel});
-        React.findDOMNode(this.refs.wrapper).focus();
+        ReactDOM.findDOMNode(this.refs.wrapper).focus();
     }
     handleEmailRadio(enableEmail) {
         this.setState({enableEmail: enableEmail});
-        React.findDOMNode(this.refs.wrapper).focus();
+        ReactDOM.findDOMNode(this.refs.wrapper).focus();
     }
     handleSoundRadio(enableSound) {
         this.setState({enableSound: enableSound});
-        React.findDOMNode(this.refs.wrapper).focus();
+        ReactDOM.findDOMNode(this.refs.wrapper).focus();
     }
     updateUsernameKey(val) {
         this.setState({usernameKey: val});
@@ -184,10 +184,10 @@ export default class NotificationsTab extends React.Component {
         this.setState({channelKey: val});
     }
     updateCustomMentionKeys() {
-        var checked = React.findDOMNode(this.refs.customcheck).checked;
+        var checked = ReactDOM.findDOMNode(this.refs.customcheck).checked;
 
         if (checked) {
-            var text = React.findDOMNode(this.refs.custommentions).value;
+            var text = ReactDOM.findDOMNode(this.refs.custommentions).value;
 
             // remove all spaces and split string into individual keys
             this.setState({customKeys: text.replace(/ /g, ''), customKeysChecked: true});
@@ -196,7 +196,7 @@ export default class NotificationsTab extends React.Component {
         }
     }
     onCustomChange() {
-        React.findDOMNode(this.refs.customcheck).checked = true;
+        ReactDOM.findDOMNode(this.refs.customcheck).checked = true;
         this.updateCustomMentionKeys();
     }
     render() {

web/react/components/user_settings/user_settings_security.jsx

@@ -82,7 +82,7 @@ export default class SecurityTab extends React.Component {
         $('#user_settings').modal('hide');
     }
     handleClose() {
-        $(React.findDOMNode(this)).find('.form-control').each(function resetValue() {
+        $(ReactDOM.findDOMNode(this)).find('.form-control').each(function resetValue() {
             this.value = '';
         });
         this.setState({currentPassword: '', newPassword: '', confirmPassword: '', serverError: null, passwordError: null});