summaryrefslogtreecommitdiffstats
path: root/web/react
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-09-15 19:29:00 -0700
committer=Corey Hulen <corey@hulen.com>2015-09-15 19:29:00 -0700
commitd625e62d96197daac73feff0ce353b0e86ab4e60 (patch)
tree90d0efa75f4abb91ddf75151308691f45cb45bd4 /web/react
parent5e2f701e6c6c8bfa87b2913100365b45264470c3 (diff)
downloadchat-d625e62d96197daac73feff0ce353b0e86ab4e60.tar.gz
chat-d625e62d96197daac73feff0ce353b0e86ab4e60.tar.bz2
chat-d625e62d96197daac73feff0ce353b0e86ab4e60.zip
Finished removing some of the last bits of client side config
Diffstat (limited to 'web/react')
-rw-r--r--web/react/pages/channel.jsx1
-rw-r--r--web/react/pages/signup_team.jsx1
-rw-r--r--web/react/utils/async_client.jsx26
-rw-r--r--web/react/utils/client.jsx14
4 files changed, 1 insertions, 41 deletions
diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx
index 1f034165f..59debb422 100644
--- a/web/react/pages/channel.jsx
+++ b/web/react/pages/channel.jsx
@@ -40,7 +40,6 @@ var Constants = require('../utils/constants.jsx');
var ActionTypes = Constants.ActionTypes;
function setupChannelPage(props) {
- AsyncClient.getConfig();
AppDispatcher.handleViewAction({
type: ActionTypes.CLICK_CHANNEL,
diff --git a/web/react/pages/signup_team.jsx b/web/react/pages/signup_team.jsx
index 5346347ec..b1a81cd1e 100644
--- a/web/react/pages/signup_team.jsx
+++ b/web/react/pages/signup_team.jsx
@@ -6,7 +6,6 @@ var SignupTeam = require('../components/signup_team.jsx');
var AsyncClient = require('../utils/async_client.jsx');
function setupSignupTeamPage(props) {
- AsyncClient.getConfig();
var services = JSON.parse(props.AuthServices);
diff --git a/web/react/utils/async_client.jsx b/web/react/utils/async_client.jsx
index 6b8e73c5a..3e23e5c33 100644
--- a/web/react/utils/async_client.jsx
+++ b/web/react/utils/async_client.jsx
@@ -582,28 +582,4 @@ export function getMyTeam() {
dispatchError(err, 'getMyTeam');
}
);
-}
-
-export function getConfig() {
- if (isCallInProgress('getConfig')) {
- return;
- }
-
- callTracker.getConfig = utils.getTimestamp();
- client.getConfig(
- function getConfigSuccess(data, textStatus, xhr) {
- callTracker.getConfig = 0;
-
- if (data && xhr.status !== 304) {
- AppDispatcher.handleServerAction({
- type: ActionTypes.RECIEVED_CONFIG,
- settings: data
- });
- }
- },
- function getConfigFailure(err) {
- callTracker.getConfig = 0;
- dispatchError(err, 'getConfig');
- }
- );
-}
+} \ No newline at end of file
diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx
index ebd6640d7..902eb1642 100644
--- a/web/react/utils/client.jsx
+++ b/web/react/utils/client.jsx
@@ -987,17 +987,3 @@ export function updateValetFeature(data, success, error) {
track('api', 'api_teams_update_valet_feature');
}
-
-export function getConfig(success, error) {
- $.ajax({
- url: '/api/v1/config/get_all',
- dataType: 'json',
- type: 'GET',
- ifModified: true,
- success: success,
- error: function onError(xhr, status, err) {
- var e = handleError('getConfig', xhr, status, err);
- error(e);
- }
- });
-}