mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

Rename areStatesEqual to areObjectsEqual and make it more comprehensive and accurate.

Просмотр исходного кода
Этот коммит содержится в:
JoramWilander
2015-11-12 11:19:59 -05:00
родитель 13a251a5ee
Коммит 50815f9be7
28 изменённых файлов: 138 добавлений и 47 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
web/react/components/access_history_modal.jsx
Просмотреть файл

@@ -54,7 +54,7 @@ export default class AccessHistoryModal extends React.Component {
}
onAuditChange() {
var newState = this.getStateFromStoresForAudits();
if (!Utils.areStatesEqual(newState.audits, this.state.audits)) {
if (!Utils.areObjectsEqual(newState.audits, this.state.audits)) {
this.setState(newState);
}
}

2
web/react/components/activity_log_modal.jsx
Просмотреть файл

@@ -73,7 +73,7 @@ export default class ActivityLogModal extends React.Component {
}
onListenerChange() {
const newState = this.getStateFromStores();
if (!Utils.areStatesEqual(newState.sessions, this.state.sessions)) {
if (!Utils.areObjectsEqual(newState.sessions, this.state.sessions)) {
this.setState(newState);
}
}

2
web/react/components/channel_header.jsx
Просмотреть файл

@@ -63,7 +63,7 @@ export default class ChannelHeader extends React.Component {
}
onListenerChange() {
const newState = this.getStateFromStores();
if (!Utils.areStatesEqual(newState, this.state)) {
if (!Utils.areObjectsEqual(newState, this.state)) {
this.setState(newState);
}
$('.channel-header__info .description').popover({placement: 'bottom', trigger: 'hover', html: true, delay: {show: 500, hide: 500}});

2
web/react/components/channel_invite_modal.jsx
Просмотреть файл

@@ -78,7 +78,7 @@ export default class ChannelInviteModal extends React.Component {
}
onListenerChange() {
var newState = this.getStateFromStores();
if (!Utils.areStatesEqual(this.state, newState)) {
if (!Utils.areObjectsEqual(this.state, newState)) {
this.setState(newState);
}
}

2
web/react/components/channel_members_modal.jsx
Просмотреть файл

@@ -91,7 +91,7 @@ export default class ChannelMembersModal extends React.Component {
}
onChange() {
const newState = this.getStateFromStores();
if (!Utils.areStatesEqual(this.state, newState)) {
if (!Utils.areObjectsEqual(this.state, newState)) {
this.setState(newState);
}
}

2
web/react/components/channel_notifications.jsx
Просмотреть файл

@@ -69,7 +69,7 @@ export default class ChannelNotifications extends React.Component {
newState.notifyLevel = notifyLevel;
newState.markUnreadLevel = markUnreadLevel;
if (!Utils.areStatesEqual(this.state, newState)) {
if (!Utils.areObjectsEqual(this.state, newState)) {
this.setState(newState);
}
}

2
web/react/components/delete_post_modal.jsx
Просмотреть файл

@@ -81,7 +81,7 @@ export default class DeletePostModal extends React.Component {
}
onListenerChange() {
var newList = PostStore.getSelectedPost();
if (!Utils.areStatesEqual(this.state.selectedList, newList)) {
if (!Utils.areObjectsEqual(this.state.selectedList, newList)) {
this.setState({selectedList: newList});
}
}

2
web/react/components/file_attachment.jsx
Просмотреть файл

@@ -67,7 +67,7 @@ export default class FileAttachment extends React.Component {
this.canSetState = false;
}
shouldComponentUpdate(nextProps, nextState) {
if (!utils.areStatesEqual(nextProps, this.props)) {
if (!utils.areObjectsEqual(nextProps, this.props)) {
return true;
}

2
web/react/components/more_channels.jsx
Просмотреть файл

@@ -46,7 +46,7 @@ export default class MoreChannels extends React.Component {
}
onListenerChange() {
var newState = getStateFromStores();
if (!utils.areStatesEqual(newState.channels, this.state.channels)) {
if (!utils.areObjectsEqual(newState.channels, this.state.channels)) {
this.setState(newState);
}
}

2
web/react/components/navbar_dropdown.jsx
Просмотреть файл

@@ -70,7 +70,7 @@ export default class NavbarDropdown extends React.Component {
}
onListenerChange() {
var newState = getStateFromStores();
if (!Utils.areStatesEqual(newState, this.state)) {
if (!Utils.areObjectsEqual(newState, this.state)) {
this.setState(newState);
}
}

2
web/react/components/notify_counts.jsx
Просмотреть файл

@@ -39,7 +39,7 @@ export default class NotifyCounts extends React.Component {
}
onListenerChange() {
var newState = getCountsStateFromStores();
if (!utils.areStatesEqual(newState, this.state)) {
if (!utils.areObjectsEqual(newState, this.state)) {
this.setState(newState);
}
}

2
web/react/components/post.jsx
Просмотреть файл

@@ -77,7 +77,7 @@ export default class Post extends React.Component {
this.forceUpdate();
}
shouldComponentUpdate(nextProps) {
if (!utils.areStatesEqual(nextProps.post, this.props.post)) {
if (!utils.areObjectsEqual(nextProps.post, this.props.post)) {
return true;
}

2
web/react/components/posts_view.jsx
Просмотреть файл

@@ -240,7 +240,7 @@ export default class PostsView extends React.Component {
if (this.props.messageSeparatorTime !== nextProps.messageSeparatorTime) {
return true;
}
if (!Utils.areStatesEqual(this.props.postList, nextProps.postList)) {
if (!Utils.areObjectsEqual(this.props.postList, nextProps.postList)) {
return true;
}

2
web/react/components/posts_view_container.jsx
Просмотреть файл

@@ -223,7 +223,7 @@ export default class PostsViewContainer extends React.Component {
}
}
shouldComponentUpdate(nextProps, nextState) {
if (Utils.areStatesEqual(this.state, nextState)) {
if (Utils.areObjectsEqual(this.state, nextState)) {
return false;
}

2
web/react/components/rhs_comment.jsx
Просмотреть файл

@@ -61,7 +61,7 @@ export default class RhsComment extends React.Component {
this.parseEmojis();
}
shouldComponentUpdate(nextProps) {
if (!Utils.areStatesEqual(nextProps.post, this.props.post)) {
if (!Utils.areObjectsEqual(nextProps.post, this.props.post)) {
return true;
}

2
web/react/components/rhs_root_post.jsx
Просмотреть файл

@@ -26,7 +26,7 @@ export default class RhsRootPost extends React.Component {
this.parseEmojis();
}
shouldComponentUpdate(nextProps) {
if (!utils.areStatesEqual(nextProps.post, this.props.post)) {
if (!utils.areObjectsEqual(nextProps.post, this.props.post)) {
return true;
}

4
web/react/components/rhs_thread.jsx
Просмотреть файл

@@ -82,7 +82,7 @@ export default class RhsThread extends React.Component {
}
onChange() {
var newState = this.getStateFromStores();
if (!Utils.areStatesEqual(newState, this.state)) {
if (!Utils.areObjectsEqual(newState, this.state)) {
this.setState(newState);
}
}
@@ -112,7 +112,7 @@ export default class RhsThread extends React.Component {
}
var newState = this.getStateFromStores();
if (!Utils.areStatesEqual(newState, this.state)) {
if (!Utils.areObjectsEqual(newState, this.state)) {
this.setState(newState);
}
}

2
web/react/components/search_bar.jsx
Просмотреть файл

@@ -46,7 +46,7 @@ export default class SearchBar extends React.Component {
onListenerChange(doSearch, isMentionSearch) {
if (this.mounted) {
var newState = this.getSearchTermStateFromStores();
if (!utils.areStatesEqual(newState, this.state)) {
if (!utils.areObjectsEqual(newState, this.state)) {
this.setState(newState);
}
if (doSearch) {

2
web/react/components/search_results.jsx
Просмотреть файл

@@ -55,7 +55,7 @@ export default class SearchResults extends React.Component {
onChange() {
if (this.mounted) {
var newState = getStateFromStores();
if (!Utils.areStatesEqual(newState, this.state)) {
if (!Utils.areObjectsEqual(newState, this.state)) {
this.setState(newState);
}
}

7
web/react/components/sidebar.jsx
Просмотреть файл

@@ -173,7 +173,7 @@ export default class Sidebar extends React.Component {
window.addEventListener('resize', this.handleResize);
}
shouldComponentUpdate(nextProps, nextState) {
if (!Utils.areStatesEqual(nextState, this.state)) {
if (!Utils.areObjectsEqual(nextState, this.state)) {
return true;
}
return false;
@@ -205,10 +205,7 @@ export default class Sidebar extends React.Component {
}
}
onChange() {
var newState = this.getStateFromStores();
if (!Utils.areStatesEqual(newState, this.state)) {
this.setState(newState);
}
this.setState(this.getStateFromStores());
}
updateTitle() {
const channel = ChannelStore.getCurrent();

4
web/react/components/sidebar_right.jsx
Просмотреть файл

@@ -66,13 +66,13 @@ export default class SidebarRight extends React.Component {
onSelectedChange(fromSearch) {
var newState = getStateFromStores(fromSearch);
newState.from_search = fromSearch;
if (!Utils.areStatesEqual(newState, this.state)) {
if (!Utils.areObjectsEqual(newState, this.state)) {
this.setState(newState);
}
}
onSearchChange() {
var newState = getStateFromStores();
if (!Utils.areStatesEqual(newState, this.state)) {
if (!Utils.areObjectsEqual(newState, this.state)) {
this.setState(newState);
}
}

2
web/react/components/team_members.jsx
Просмотреть файл

@@ -59,7 +59,7 @@ export default class TeamMembers extends React.Component {
onChange() {
var newState = getStateFromStores();
if (!utils.areStatesEqual(newState, this.state)) {
if (!utils.areObjectsEqual(newState, this.state)) {
this.setState(newState);
}
}

2
web/react/components/team_settings.jsx
Просмотреть файл

@@ -23,7 +23,7 @@ export default class TeamSettings extends React.Component {
}
onChange() {
var team = TeamStore.getCurrent();
if (!Utils.areStatesEqual(this.state.team, team)) {
if (!Utils.areObjectsEqual(this.state.team, team)) {
this.setState({team});
}
}

2
web/react/components/user_profile.jsx
Просмотреть файл

@@ -43,7 +43,7 @@ export default class UserProfile extends React.Component {
onChange(userId) {
if (!userId || userId === this.props.userId) {
var newState = this.getStateFromStores(this.props.userId);
if (!Utils.areStatesEqual(newState, this.state)) {
if (!Utils.areObjectsEqual(newState, this.state)) {
this.setState(newState);
}
}

2
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});
}
}

12
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);
}

20
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);
}
}