summaryrefslogtreecommitdiffstats
path: root/web/react/pages
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-02-22 10:54:42 -0500
committerHarrison Healey <harrisonmhealey@gmail.com>2016-02-22 10:54:42 -0500
commit32ae72d91d31699899d5e2084cf7faa40c81e42c (patch)
tree7e5e2f7ed7a1d2edca368ca91bd8416336a6cedf /web/react/pages
parent51680a7cd84661340cb727fea09b99d5350d9160 (diff)
parent4c92a1c1e35402730f74cf24a0c71729f4d0a676 (diff)
downloadchat-32ae72d91d31699899d5e2084cf7faa40c81e42c.tar.gz
chat-32ae72d91d31699899d5e2084cf7faa40c81e42c.tar.bz2
chat-32ae72d91d31699899d5e2084cf7faa40c81e42c.zip
Merge pull request #2208 from mattermost/client-upgrades
Updating some client deps + eslint
Diffstat (limited to 'web/react/pages')
-rw-r--r--web/react/pages/admin_console.jsx4
-rw-r--r--web/react/pages/authorize.jsx3
-rw-r--r--web/react/pages/channel.jsx25
-rw-r--r--web/react/pages/claim_account.jsx2
-rw-r--r--web/react/pages/docs.jsx4
-rw-r--r--web/react/pages/find_team.jsx4
-rw-r--r--web/react/pages/login.jsx2
-rw-r--r--web/react/pages/password_reset.jsx2
-rw-r--r--web/react/pages/signup_team.jsx2
-rw-r--r--web/react/pages/signup_team_complete.jsx2
-rw-r--r--web/react/pages/signup_team_confirm.jsx2
-rw-r--r--web/react/pages/signup_user_complete.jsx2
-rw-r--r--web/react/pages/verify.jsx2
13 files changed, 28 insertions, 28 deletions
diff --git a/web/react/pages/admin_console.jsx b/web/react/pages/admin_console.jsx
index 3f4c39934..989936d9e 100644
--- a/web/react/pages/admin_console.jsx
+++ b/web/react/pages/admin_console.jsx
@@ -56,7 +56,7 @@ class Root extends React.Component {
tab={this.props.map.ActiveTab}
teamId={this.props.map.TeamId}
/>
- <SelectTeamModal />
+ <SelectTeamModal/>
</div>
</IntlProvider>
);
@@ -65,7 +65,7 @@ class Root extends React.Component {
global.window.setup_admin_console_page = function setup(props) {
ReactDOM.render(
- <Root map={props} />,
+ <Root map={props}/>,
document.getElementById('admin_controller')
);
};
diff --git a/web/react/pages/authorize.jsx b/web/react/pages/authorize.jsx
index 7474332ce..20fea19f0 100644
--- a/web/react/pages/authorize.jsx
+++ b/web/react/pages/authorize.jsx
@@ -29,6 +29,7 @@ class Root extends React.Component {
translations: data,
loaded: true
});
+ return;
},
() => {
this.setState({
@@ -64,7 +65,7 @@ class Root extends React.Component {
global.window.setup_authorize_page = function setup(props) {
ReactDOM.render(
- <Root map={props} />,
+ <Root map={props}/>,
document.getElementById('authorize')
);
};
diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx
index bd7c7c69b..61fa91cf8 100644
--- a/web/react/pages/channel.jsx
+++ b/web/react/pages/channel.jsx
@@ -68,18 +68,17 @@ class Root extends React.Component {
<ChannelLoader/>
<ErrorBar/>
<ChannelView/>
-
- <GetPostLinkModal />
- <GetTeamInviteLinkModal />
- <InviteMemberModal />
- <ImportThemeModal />
- <TeamSettingsModal />
- <RenameChannelModal />
- <MoreChannelsModal />
- <EditPostModal />
- <DeletePostModal />
- <RemovedFromChannelModal />
- <RegisterAppModal />
+ <GetPostLinkModal/>
+ <GetTeamInviteLinkModal/>
+ <InviteMemberModal/>
+ <ImportThemeModal/>
+ <TeamSettingsModal/>
+ <RenameChannelModal/>
+ <MoreChannelsModal/>
+ <EditPostModal/>
+ <DeletePostModal/>
+ <RemovedFromChannelModal/>
+ <RegisterAppModal/>
</div>
</IntlProvider>
);
@@ -94,7 +93,7 @@ global.window.setup_channel_page = function setup(props, team, channel) {
}
ReactDOM.render(
- <Root map={props} />,
+ <Root map={props}/>,
document.getElementById('channel_view')
);
};
diff --git a/web/react/pages/claim_account.jsx b/web/react/pages/claim_account.jsx
index 7c6af73ca..abbf72ea3 100644
--- a/web/react/pages/claim_account.jsx
+++ b/web/react/pages/claim_account.jsx
@@ -62,7 +62,7 @@ class Root extends React.Component {
global.window.setup_claim_account_page = function setup(props) {
ReactDOM.render(
- <Root map={props} />,
+ <Root map={props}/>,
document.getElementById('claim')
);
}; \ No newline at end of file
diff --git a/web/react/pages/docs.jsx b/web/react/pages/docs.jsx
index 2f5d4db55..2e47e3e6a 100644
--- a/web/react/pages/docs.jsx
+++ b/web/react/pages/docs.jsx
@@ -48,7 +48,7 @@ class Root extends React.Component {
locale={this.props.map.Locale}
messages={this.state.translations}
>
- <Docs site={this.props.map.Site} />
+ <Docs site={this.props.map.Site}/>
</IntlProvider>
);
}
@@ -58,7 +58,7 @@ global.window.mm_user = global.window.mm_user || {};
global.window.setup_documentation_page = function setup(props) {
ReactDOM.render(
- <Root map={props} />,
+ <Root map={props}/>,
document.getElementById('docs')
);
};
diff --git a/web/react/pages/find_team.jsx b/web/react/pages/find_team.jsx
index ee2cf0de1..93394fcde 100644
--- a/web/react/pages/find_team.jsx
+++ b/web/react/pages/find_team.jsx
@@ -48,7 +48,7 @@ class Root extends React.Component {
locale={this.props.map.Locale}
messages={this.state.translations}
>
- <FindTeam />
+ <FindTeam/>
</IntlProvider>
);
}
@@ -56,7 +56,7 @@ class Root extends React.Component {
global.window.setup_find_team_page = function setup(props) {
ReactDOM.render(
- <Root map={props} />,
+ <Root map={props}/>,
document.getElementById('find-team')
);
}; \ No newline at end of file
diff --git a/web/react/pages/login.jsx b/web/react/pages/login.jsx
index 38852ad7c..ec9080945 100644
--- a/web/react/pages/login.jsx
+++ b/web/react/pages/login.jsx
@@ -60,7 +60,7 @@ class Root extends React.Component {
global.window.setup_login_page = function setup(props) {
ReactDOM.render(
- <Root map={props} />,
+ <Root map={props}/>,
document.getElementById('login')
);
}; \ No newline at end of file
diff --git a/web/react/pages/password_reset.jsx b/web/react/pages/password_reset.jsx
index 23bbf2691..7caff5034 100644
--- a/web/react/pages/password_reset.jsx
+++ b/web/react/pages/password_reset.jsx
@@ -62,7 +62,7 @@ class Root extends React.Component {
global.window.setup_password_reset_page = function setup(props) {
ReactDOM.render(
- <Root map={props} />,
+ <Root map={props}/>,
document.getElementById('reset')
);
};
diff --git a/web/react/pages/signup_team.jsx b/web/react/pages/signup_team.jsx
index c80b65580..f276c3ff7 100644
--- a/web/react/pages/signup_team.jsx
+++ b/web/react/pages/signup_team.jsx
@@ -49,7 +49,7 @@ class Root extends React.Component {
locale={this.props.map.Locale}
messages={this.state.translations}
>
- <SignupTeam teams={this.props.teams} />
+ <SignupTeam teams={this.props.teams}/>
</IntlProvider>
);
}
diff --git a/web/react/pages/signup_team_complete.jsx b/web/react/pages/signup_team_complete.jsx
index 1bee4e598..8c237f698 100644
--- a/web/react/pages/signup_team_complete.jsx
+++ b/web/react/pages/signup_team_complete.jsx
@@ -60,7 +60,7 @@ class Root extends React.Component {
global.window.setup_signup_team_complete_page = function setup(props) {
ReactDOM.render(
- <Root map={props} />,
+ <Root map={props}/>,
document.getElementById('signup-team-complete')
);
}; \ No newline at end of file
diff --git a/web/react/pages/signup_team_confirm.jsx b/web/react/pages/signup_team_confirm.jsx
index 9a536c92e..13c8f3fd0 100644
--- a/web/react/pages/signup_team_confirm.jsx
+++ b/web/react/pages/signup_team_confirm.jsx
@@ -58,7 +58,7 @@ class Root extends React.Component {
global.window.setup_signup_team_confirm_page = function setup(props) {
ReactDOM.render(
- <Root map={props} />,
+ <Root map={props}/>,
document.getElementById('signup-team-confirm')
);
}; \ No newline at end of file
diff --git a/web/react/pages/signup_user_complete.jsx b/web/react/pages/signup_user_complete.jsx
index 6c761c1ee..a14f2140b 100644
--- a/web/react/pages/signup_user_complete.jsx
+++ b/web/react/pages/signup_user_complete.jsx
@@ -63,7 +63,7 @@ class Root extends React.Component {
global.window.setup_signup_user_complete_page = function setup(props) {
ReactDOM.render(
- <Root map={props} />,
+ <Root map={props}/>,
document.getElementById('signup-user-complete')
);
}; \ No newline at end of file
diff --git a/web/react/pages/verify.jsx b/web/react/pages/verify.jsx
index 2fc619e58..6b336daa1 100644
--- a/web/react/pages/verify.jsx
+++ b/web/react/pages/verify.jsx
@@ -61,7 +61,7 @@ class Root extends React.Component {
global.window.setupVerifyPage = function setup(props) {
ReactDOM.render(
- <Root map={props} />,
+ <Root map={props}/>,
document.getElementById('verify')
);
};