Skip to content

Commit

Permalink
Moving javascript driver back to platform (mattermost#3613)
Browse files Browse the repository at this point in the history
  • Loading branch information
crspeller authored Jul 19, 2016
1 parent 6467c0a commit 4b51566
Show file tree
Hide file tree
Showing 89 changed files with 4,303 additions and 95 deletions.
2 changes: 1 addition & 1 deletion actions/analytics_actions.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) 2016 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information.

import Client from 'utils/web_client.jsx';
import Client from 'client/web_client.jsx';

export function track(category, action, label, property, value) {
Client.track(category, action, label, property, value);
Expand Down
2 changes: 1 addition & 1 deletion actions/channel_actions.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import TeamStore from 'stores/team_store.jsx';
import UserStore from 'stores/user_store.jsx';
import ChannelStore from 'stores/channel_store.jsx';
import * as AsyncClient from 'utils/async_client.jsx';
import Client from 'utils/web_client.jsx';
import Client from 'client/web_client.jsx';

export function goToChannel(channel) {
if (channel.fake) {
Expand Down
4 changes: 2 additions & 2 deletions actions/global_actions.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import {handleNewPost} from 'actions/post_actions.jsx';
import Constants from 'utils/constants.jsx';
const ActionTypes = Constants.ActionTypes;

import Client from 'utils/web_client.jsx';
import Client from 'client/web_client.jsx';
import * as AsyncClient from 'utils/async_client.jsx';
import WebSocketClient from 'utils/websocket_client.jsx';
import WebSocketClient from 'client/web_websocket_client.jsx';
import * as Utils from 'utils/utils.jsx';

import en from 'i18n/en.json';
Expand Down
2 changes: 1 addition & 1 deletion actions/post_actions.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import * as PostUtils from 'utils/post_utils.jsx';
import Constants from 'utils/constants.jsx';
const ActionTypes = Constants.ActionTypes;

import Client from 'utils/web_client.jsx';
import Client from 'client/web_client.jsx';
import * as AsyncClient from 'utils/async_client.jsx';

export function handleNewPost(post, msg) {
Expand Down
2 changes: 1 addition & 1 deletion actions/team_actions.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Constants from 'utils/constants.jsx';
const ActionTypes = Constants.ActionTypes;

import * as AsyncClient from 'utils/async_client.jsx';
import Client from 'utils/web_client.jsx';
import Client from 'client/web_client.jsx';
import AppDispatcher from 'dispatcher/app_dispatcher.jsx';

import {browserHistory} from 'react-router/es6';
Expand Down
2 changes: 1 addition & 1 deletion actions/user_actions.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import AppDispatcher from 'dispatcher/app_dispatcher.jsx';
import * as AsyncClient from 'utils/async_client.jsx';
import Client from 'utils/web_client.jsx';
import Client from 'client/web_client.jsx';

import PreferenceStore from 'stores/preference_store.jsx';
import TeamStore from 'stores/team_store.jsx';
Expand Down
4 changes: 2 additions & 2 deletions actions/websocket_actions.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import BrowserStore from 'stores/browser_store.jsx';
import ErrorStore from 'stores/error_store.jsx';
import NotificationStore from 'stores/notification_store.jsx'; //eslint-disable-line no-unused-vars

import Client from 'utils/web_client.jsx';
import WebSocketClient from 'utils/websocket_client.jsx';
import Client from 'client/web_client.jsx';
import WebSocketClient from 'client/web_websocket_client.jsx';
import * as Utils from 'utils/utils.jsx';
import * as AsyncClient from 'utils/async_client.jsx';

Expand Down
Loading

0 comments on commit 4b51566

Please sign in to comment.