From d625e62d96197daac73feff0ce353b0e86ab4e60 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Tue, 15 Sep 2015 19:29:00 -0700 Subject: Finished removing some of the last bits of client side config --- web/react/pages/channel.jsx | 1 - web/react/pages/signup_team.jsx | 1 - web/react/utils/async_client.jsx | 26 +------------------------- web/react/utils/client.jsx | 14 -------------- 4 files changed, 1 insertion(+), 41 deletions(-) (limited to 'web/react') 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); - } - }); -} -- cgit v1.2.3-1-g7c22