Changed imports to be upper case for multiple files.
Этот коммит содержится в:
@@ -4,7 +4,7 @@
|
||||
var UserStore = require('../stores/user_store.jsx');
|
||||
var AsyncClient = require('../utils/async_client.jsx');
|
||||
var LoadingScreen = require('./loading_screen.jsx');
|
||||
var utils = require('../utils/utils.jsx');
|
||||
var Utils = require('../utils/utils.jsx');
|
||||
|
||||
export default class AccessHistoryModal extends React.Component {
|
||||
constructor(props) {
|
||||
@@ -38,7 +38,7 @@ export default class AccessHistoryModal extends React.Component {
|
||||
}
|
||||
onAuditChange() {
|
||||
var newState = this.getStateFromStoresForAudits();
|
||||
if (!utils.areStatesEqual(newState.audits, this.state.audits)) {
|
||||
if (!Utils.areStatesEqual(newState.audits, this.state.audits)) {
|
||||
this.setState(newState);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
var SettingItemMin = require('./setting_item_min.jsx');
|
||||
var SettingItemMax = require('./setting_item_max.jsx');
|
||||
|
||||
var utils = require('../utils/utils.jsx');
|
||||
var client = require('../utils/client.jsx');
|
||||
var Utils = require('../utils/utils.jsx');
|
||||
var Client = require('../utils/client.jsx');
|
||||
var UserStore = require('../stores/user_store.jsx');
|
||||
var ChannelStore = require('../stores/channel_store.jsx');
|
||||
|
||||
@@ -58,7 +58,7 @@ export default class ChannelNotifications extends React.Component {
|
||||
newState.notifyLevel = notifyLevel;
|
||||
newState.quietMode = quietMode;
|
||||
|
||||
if (!utils.areStatesEqual(this.state, newState)) {
|
||||
if (!Utils.areStatesEqual(this.state, newState)) {
|
||||
this.setState(newState);
|
||||
}
|
||||
}
|
||||
@@ -81,7 +81,7 @@ export default class ChannelNotifications extends React.Component {
|
||||
return;
|
||||
}
|
||||
|
||||
client.updateNotifyLevel(data,
|
||||
Client.updateNotifyLevel(data,
|
||||
function success() {
|
||||
var member = ChannelStore.getMember(channelId);
|
||||
member.notify_level = notifyLevel;
|
||||
|
||||
@@ -8,7 +8,7 @@ var SocketStore = require('../stores/socket_store.jsx');
|
||||
var UserStore = require('../stores/user_store.jsx');
|
||||
var TeamStore = require('../stores/team_store.jsx');
|
||||
var BrowserStore = require('../stores/browser_store.jsx');
|
||||
var utils = require('../utils/utils.jsx');
|
||||
var Utils = require('../utils/utils.jsx');
|
||||
var SidebarHeader = require('./sidebar_header.jsx');
|
||||
var SearchBox = require('./search_bar.jsx');
|
||||
var Constants = require('../utils/constants.jsx');
|
||||
@@ -166,7 +166,7 @@ export default class Sidebar extends React.Component {
|
||||
}
|
||||
onChange() {
|
||||
var newState = this.getStateFromStores();
|
||||
if (!utils.areStatesEqual(newState, this.state)) {
|
||||
if (!Utils.areStatesEqual(newState, this.state)) {
|
||||
this.setState(newState);
|
||||
}
|
||||
}
|
||||
@@ -218,17 +218,17 @@ export default class Sidebar extends React.Component {
|
||||
|
||||
if (notifyText.length === 0) {
|
||||
if (msgProps.image) {
|
||||
utils.notifyMe(title, username + ' uploaded an image', channel);
|
||||
Utils.notifyMe(title, username + ' uploaded an image', channel);
|
||||
} else if (msgProps.otherFile) {
|
||||
utils.notifyMe(title, username + ' uploaded a file', channel);
|
||||
Utils.notifyMe(title, username + ' uploaded a file', channel);
|
||||
} else {
|
||||
utils.notifyMe(title, username + ' did something new', channel);
|
||||
Utils.notifyMe(title, username + ' did something new', channel);
|
||||
}
|
||||
} else {
|
||||
utils.notifyMe(title, username + ' wrote: ' + notifyText, channel);
|
||||
Utils.notifyMe(title, username + ' wrote: ' + notifyText, channel);
|
||||
}
|
||||
if (!user.notify_props || user.notify_props.desktop_sound === 'true') {
|
||||
utils.ding();
|
||||
Utils.ding();
|
||||
}
|
||||
}
|
||||
} else if (msg.action === 'viewed') {
|
||||
@@ -258,7 +258,7 @@ export default class Sidebar extends React.Component {
|
||||
var channel = ChannelStore.getCurrent();
|
||||
if (channel) {
|
||||
if (channel.type === 'D') {
|
||||
var teammateUsername = utils.getDirectTeammate(channel.id).username;
|
||||
var teammateUsername = Utils.getDirectTeammate(channel.id).username;
|
||||
document.title = teammateUsername + ' ' + document.title.substring(document.title.lastIndexOf('-'));
|
||||
} else {
|
||||
document.title = channel.display_name + ' ' + document.title.substring(document.title.lastIndexOf('-'));
|
||||
@@ -371,11 +371,11 @@ export default class Sidebar extends React.Component {
|
||||
if (!channel.fake) {
|
||||
handleClick = function clickHandler(e) {
|
||||
e.preventDefault();
|
||||
utils.switchChannel(channel);
|
||||
Utils.switchChannel(channel);
|
||||
};
|
||||
} else if (channel.fake && teamURL) {
|
||||
// It's a direct message channel that doesn't exist yet so let's create it now
|
||||
var otherUserId = utils.getUserIdFromChannelName(channel);
|
||||
var otherUserId = Utils.getUserIdFromChannelName(channel);
|
||||
|
||||
if (self.state.loadingDMChannel === -1) {
|
||||
handleClick = function clickHandler(e) {
|
||||
@@ -386,7 +386,7 @@ export default class Sidebar extends React.Component {
|
||||
function success(data) {
|
||||
self.setState({loadingDMChannel: -1});
|
||||
AsyncClient.getChannel(data.id);
|
||||
utils.switchChannel(data);
|
||||
Utils.switchChannel(data);
|
||||
},
|
||||
function error() {
|
||||
self.setState({loadingDMChannel: -1});
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
var SettingItemMin = require('./setting_item_min.jsx');
|
||||
var SettingItemMax = require('./setting_item_max.jsx');
|
||||
|
||||
var client = require('../utils/client.jsx');
|
||||
var Client = require('../utils/client.jsx');
|
||||
var AsyncClient = require('../utils/async_client.jsx');
|
||||
|
||||
export default class FeatureTab extends React.Component {
|
||||
@@ -38,7 +38,7 @@ export default class FeatureTab extends React.Component {
|
||||
var data = {};
|
||||
data.allow_valet = this.state.allowValet;
|
||||
|
||||
client.updateValetFeature(data,
|
||||
Client.updateValetFeature(data,
|
||||
function success() {
|
||||
this.props.updateSection('');
|
||||
AsyncClient.getMyTeam();
|
||||
|
||||
@@ -5,7 +5,7 @@ var TeamStore = require('../stores/team_store.jsx');
|
||||
var ImportTab = require('./team_import_tab.jsx');
|
||||
var FeatureTab = require('./team_feature_tab.jsx');
|
||||
var GeneralTab = require('./team_general_tab.jsx');
|
||||
var utils = require('../utils/utils.jsx');
|
||||
var Utils = require('../utils/utils.jsx');
|
||||
|
||||
export default class TeamSettings extends React.Component {
|
||||
constructor(props) {
|
||||
@@ -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.areStatesEqual(this.state.team, team)) {
|
||||
this.setState({team: team});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
// Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
|
||||
// See License.txt for license information.
|
||||
|
||||
var client = require('../utils/client.jsx');
|
||||
var Client = require('../utils/client.jsx');
|
||||
var BrowserStore = require('../stores/browser_store.jsx');
|
||||
var UserStore = require('../stores/user_store.jsx');
|
||||
|
||||
@@ -35,13 +35,13 @@ export default class TeamSignupPasswordPage extends React.Component {
|
||||
teamSignup.user.allow_marketing = true;
|
||||
delete teamSignup.wizard;
|
||||
|
||||
client.createTeamFromSignup(teamSignup,
|
||||
Client.createTeamFromSignup(teamSignup,
|
||||
function success() {
|
||||
client.track('signup', 'signup_team_08_complete');
|
||||
Client.track('signup', 'signup_team_08_complete');
|
||||
|
||||
var props = this.props;
|
||||
|
||||
client.loginByEmail(teamSignup.team.name, teamSignup.team.email, teamSignup.user.password,
|
||||
Client.loginByEmail(teamSignup.team.name, teamSignup.team.email, teamSignup.user.password,
|
||||
function loginSuccess() {
|
||||
UserStore.setLastEmail(teamSignup.team.email);
|
||||
UserStore.setCurrentUser(teamSignup.user);
|
||||
@@ -72,7 +72,7 @@ export default class TeamSignupPasswordPage extends React.Component {
|
||||
);
|
||||
}
|
||||
render() {
|
||||
client.track('signup', 'signup_team_07_password');
|
||||
Client.track('signup', 'signup_team_07_password');
|
||||
|
||||
var passwordError = null;
|
||||
var passwordDivStyle = 'form-group';
|
||||
|
||||
Ссылка в новой задаче
Block a user