From 50815f9be7195d736debd6bcd9d300dd95bbc738 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Thu, 12 Nov 2015 11:19:59 -0500
Subject: Rename areStatesEqual to areObjectsEqual and make it more
 comprehensive and accurate.

---
 web/react/components/user_settings/user_settings.jsx |  2 +-
 .../user_settings/user_settings_appearance.jsx       | 12 +++++++-----
 .../user_settings/user_settings_notifications.jsx    | 20 +++++++++++---------
 3 files changed, 19 insertions(+), 15 deletions(-)

(limited to 'web/react/components/user_settings')

diff --git a/web/react/components/user_settings/user_settings.jsx b/web/react/components/user_settings/user_settings.jsx
index e089ce973..40825ba93 100644
--- a/web/react/components/user_settings/user_settings.jsx
+++ b/web/react/components/user_settings/user_settings.jsx
@@ -36,7 +36,7 @@ export default class UserSettings extends React.Component {
 
     onListenerChange() {
         var user = UserStore.getCurrentUser();
-        if (!utils.areStatesEqual(this.state.user, user)) {
+        if (!utils.areObjectsEqual(this.state.user, user)) {
             this.setState({user});
         }
     }
diff --git a/web/react/components/user_settings/user_settings_appearance.jsx b/web/react/components/user_settings/user_settings_appearance.jsx
index d73b5f476..029a1af5e 100644
--- a/web/react/components/user_settings/user_settings_appearance.jsx
+++ b/web/react/components/user_settings/user_settings_appearance.jsx
@@ -1,13 +1,15 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var UserStore = require('../../stores/user_store.jsx');
-var Client = require('../../utils/client.jsx');
-var Utils = require('../../utils/utils.jsx');
-
 const CustomThemeChooser = require('./custom_theme_chooser.jsx');
 const PremadeThemeChooser = require('./premade_theme_chooser.jsx');
+
+const UserStore = require('../../stores/user_store.jsx');
+
 const AppDispatcher = require('../../dispatcher/app_dispatcher.jsx');
+const Client = require('../../utils/client.jsx');
+const Utils = require('../../utils/utils.jsx');
+
 const Constants = require('../../utils/constants.jsx');
 const ActionTypes = Constants.ActionTypes;
 
@@ -66,7 +68,7 @@ export default class UserSettingsAppearance extends React.Component {
     onChange() {
         const newState = this.getStateFromStores();
 
-        if (!Utils.areStatesEqual(this.state, newState)) {
+        if (!Utils.areObjectsEqual(this.state, newState)) {
             this.setState(newState);
         }
 
diff --git a/web/react/components/user_settings/user_settings_notifications.jsx b/web/react/components/user_settings/user_settings_notifications.jsx
index c6f47804f..c958bf5bc 100644
--- a/web/react/components/user_settings/user_settings_notifications.jsx
+++ b/web/react/components/user_settings/user_settings_notifications.jsx
@@ -1,16 +1,18 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var UserStore = require('../../stores/user_store.jsx');
-var SettingItemMin = require('../setting_item_min.jsx');
-var SettingItemMax = require('../setting_item_max.jsx');
-var client = require('../../utils/client.jsx');
-var AsyncClient = require('../../utils/async_client.jsx');
-var utils = require('../../utils/utils.jsx');
+const SettingItemMin = require('../setting_item_min.jsx');
+const SettingItemMax = require('../setting_item_max.jsx');
+
+const UserStore = require('../../stores/user_store.jsx');
+
+const Client = require('../../utils/client.jsx');
+const AsyncClient = require('../../utils/async_client.jsx');
+const Utils = require('../../utils/utils.jsx');
 
 function getNotificationsStateFromStores() {
     var user = UserStore.getCurrentUser();
-    var soundNeeded = !utils.isBrowserFirefox();
+    var soundNeeded = !Utils.isBrowserFirefox();
 
     var sound = 'true';
     if (user.notify_props && user.notify_props.desktop_sound) {
@@ -116,7 +118,7 @@ export default class NotificationsTab extends React.Component {
         data.all = this.state.allKey.toString();
         data.channel = this.state.channelKey.toString();
 
-        client.updateUserNotifyProps(data,
+        Client.updateUserNotifyProps(data,
             function success() {
                 this.props.updateSection('');
                 AsyncClient.getMe();
@@ -138,7 +140,7 @@ export default class NotificationsTab extends React.Component {
     }
     onListenerChange() {
         var newState = getNotificationsStateFromStores();
-        if (!utils.areStatesEqual(newState, this.state)) {
+        if (!Utils.areObjectsEqual(newState, this.state)) {
             this.setState(newState);
         }
     }
-- 
cgit v1.2.3-1-g7c22