diff options
Diffstat (limited to 'web/react/components')
130 files changed, 611 insertions, 610 deletions
diff --git a/web/react/components/access_history_modal.jsx b/web/react/components/access_history_modal.jsx index 61504a968..165d32339 100644 --- a/web/react/components/access_history_modal.jsx +++ b/web/react/components/access_history_modal.jsx @@ -2,11 +2,11 @@ // See License.txt for license information. var Modal = ReactBootstrap.Modal; -var UserStore = require('../stores/user_store.jsx'); -var ChannelStore = require('../stores/channel_store.jsx'); -var AsyncClient = require('../utils/async_client.jsx'); -var LoadingScreen = require('./loading_screen.jsx'); -var Utils = require('../utils/utils.jsx'); +import UserStore from '../stores/user_store.jsx'; +import ChannelStore from '../stores/channel_store.jsx'; +import * as AsyncClient from '../utils/async_client.jsx'; +import LoadingScreen from './loading_screen.jsx'; +import * as Utils from '../utils/utils.jsx'; export default class AccessHistoryModal extends React.Component { constructor(props) { diff --git a/web/react/components/activity_log_modal.jsx b/web/react/components/activity_log_modal.jsx index 5824ce7e2..869d648d2 100644 --- a/web/react/components/activity_log_modal.jsx +++ b/web/react/components/activity_log_modal.jsx @@ -1,12 +1,12 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const UserStore = require('../stores/user_store.jsx'); -const Client = require('../utils/client.jsx'); -const AsyncClient = require('../utils/async_client.jsx'); +import UserStore from '../stores/user_store.jsx'; +import * as Client from '../utils/client.jsx'; +import * as AsyncClient from '../utils/async_client.jsx'; const Modal = ReactBootstrap.Modal; -const LoadingScreen = require('./loading_screen.jsx'); -const Utils = require('../utils/utils.jsx'); +import LoadingScreen from './loading_screen.jsx'; +import * as Utils from '../utils/utils.jsx'; export default class ActivityLogModal extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/admin_controller.jsx b/web/react/components/admin_console/admin_controller.jsx index 3c3f03f5a..4f144b0dd 100644 --- a/web/react/components/admin_console/admin_controller.jsx +++ b/web/react/components/admin_console/admin_controller.jsx @@ -1,25 +1,25 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var AdminSidebar = require('./admin_sidebar.jsx'); -var AdminStore = require('../../stores/admin_store.jsx'); -var TeamStore = require('../../stores/team_store.jsx'); -var AsyncClient = require('../../utils/async_client.jsx'); -var LoadingScreen = require('../loading_screen.jsx'); -var Utils = require('../../utils/utils.jsx'); - -var EmailSettingsTab = require('./email_settings.jsx'); -var LogSettingsTab = require('./log_settings.jsx'); -var LogsTab = require('./logs.jsx'); -var FileSettingsTab = require('./image_settings.jsx'); -var PrivacySettingsTab = require('./privacy_settings.jsx'); -var RateSettingsTab = require('./rate_settings.jsx'); -var GitLabSettingsTab = require('./gitlab_settings.jsx'); -var SqlSettingsTab = require('./sql_settings.jsx'); -var TeamSettingsTab = require('./team_settings.jsx'); -var ServiceSettingsTab = require('./service_settings.jsx'); -var TeamUsersTab = require('./team_users.jsx'); -var TeamAnalyticsTab = require('./team_analytics.jsx'); +import AdminSidebar from './admin_sidebar.jsx'; +import AdminStore from '../../stores/admin_store.jsx'; +import TeamStore from '../../stores/team_store.jsx'; +import * as AsyncClient from '../../utils/async_client.jsx'; +import LoadingScreen from '../loading_screen.jsx'; +import * as Utils from '../../utils/utils.jsx'; + +import EmailSettingsTab from './email_settings.jsx'; +import LogSettingsTab from './log_settings.jsx'; +import LogsTab from './logs.jsx'; +import FileSettingsTab from './image_settings.jsx'; +import PrivacySettingsTab from './privacy_settings.jsx'; +import RateSettingsTab from './rate_settings.jsx'; +import GitLabSettingsTab from './gitlab_settings.jsx'; +import SqlSettingsTab from './sql_settings.jsx'; +import TeamSettingsTab from './team_settings.jsx'; +import ServiceSettingsTab from './service_settings.jsx'; +import TeamUsersTab from './team_users.jsx'; +import TeamAnalyticsTab from './team_analytics.jsx'; export default class AdminController extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/admin_navbar_dropdown.jsx b/web/react/components/admin_console/admin_navbar_dropdown.jsx index df8da94e1..783d45de6 100644 --- a/web/react/components/admin_console/admin_navbar_dropdown.jsx +++ b/web/react/components/admin_console/admin_navbar_dropdown.jsx @@ -1,11 +1,11 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Utils = require('../../utils/utils.jsx'); -var Client = require('../../utils/client.jsx'); -var TeamStore = require('../../stores/team_store.jsx'); +import * as Utils from '../../utils/utils.jsx'; +import * as Client from '../../utils/client.jsx'; +import TeamStore from '../../stores/team_store.jsx'; -var Constants = require('../../utils/constants.jsx'); +import Constants from '../../utils/constants.jsx'; function getStateFromStores() { return {currentTeam: TeamStore.getCurrent()}; diff --git a/web/react/components/admin_console/admin_sidebar.jsx b/web/react/components/admin_console/admin_sidebar.jsx index 0d52ae347..076a07618 100644 --- a/web/react/components/admin_console/admin_sidebar.jsx +++ b/web/react/components/admin_console/admin_sidebar.jsx @@ -1,9 +1,9 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var AdminSidebarHeader = require('./admin_sidebar_header.jsx'); -var SelectTeamModal = require('./select_team_modal.jsx'); -var Utils = require('../../utils/utils.jsx'); +import AdminSidebarHeader from './admin_sidebar_header.jsx'; +import SelectTeamModal from './select_team_modal.jsx'; +import * as Utils from '../../utils/utils.jsx'; export default class AdminSidebar extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/admin_sidebar_header.jsx b/web/react/components/admin_console/admin_sidebar_header.jsx index fd6d92c4a..bfd479939 100644 --- a/web/react/components/admin_console/admin_sidebar_header.jsx +++ b/web/react/components/admin_console/admin_sidebar_header.jsx @@ -1,9 +1,9 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var AdminNavbarDropdown = require('./admin_navbar_dropdown.jsx'); -var UserStore = require('../../stores/user_store.jsx'); -var Utils = require('../../utils/utils.jsx'); +import AdminNavbarDropdown from './admin_navbar_dropdown.jsx'; +import UserStore from '../../stores/user_store.jsx'; +import * as Utils from '../../utils/utils.jsx'; export default class SidebarHeader extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/email_settings.jsx b/web/react/components/admin_console/email_settings.jsx index 0cabf7f70..d0565a0e0 100644 --- a/web/react/components/admin_console/email_settings.jsx +++ b/web/react/components/admin_console/email_settings.jsx @@ -1,9 +1,9 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../../utils/client.jsx'); -var AsyncClient = require('../../utils/async_client.jsx'); -var crypto = require('crypto'); +import * as Client from '../../utils/client.jsx'; +import * as AsyncClient from '../../utils/async_client.jsx'; +import crypto from 'crypto'; export default class EmailSettings extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/gitlab_settings.jsx b/web/react/components/admin_console/gitlab_settings.jsx index f8fb6d115..8c689a2d8 100644 --- a/web/react/components/admin_console/gitlab_settings.jsx +++ b/web/react/components/admin_console/gitlab_settings.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../../utils/client.jsx'); -var AsyncClient = require('../../utils/async_client.jsx'); +import * as Client from '../../utils/client.jsx'; +import * as AsyncClient from '../../utils/async_client.jsx'; export default class GitLabSettings extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/image_settings.jsx b/web/react/components/admin_console/image_settings.jsx index 8b577e012..e1ffad7d3 100644 --- a/web/react/components/admin_console/image_settings.jsx +++ b/web/react/components/admin_console/image_settings.jsx @@ -1,9 +1,9 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../../utils/client.jsx'); -var AsyncClient = require('../../utils/async_client.jsx'); -var crypto = require('crypto'); +import * as Client from '../../utils/client.jsx'; +import * as AsyncClient from '../../utils/async_client.jsx'; +import crypto from 'crypto'; export default class FileSettings extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/log_settings.jsx b/web/react/components/admin_console/log_settings.jsx index 7e9eda89b..a91cc57ab 100644 --- a/web/react/components/admin_console/log_settings.jsx +++ b/web/react/components/admin_console/log_settings.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../../utils/client.jsx'); -var AsyncClient = require('../../utils/async_client.jsx'); +import * as Client from '../../utils/client.jsx'; +import * as AsyncClient from '../../utils/async_client.jsx'; export default class LogSettings extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/logs.jsx b/web/react/components/admin_console/logs.jsx index 3449c78d9..01135f1b8 100644 --- a/web/react/components/admin_console/logs.jsx +++ b/web/react/components/admin_console/logs.jsx @@ -1,9 +1,9 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var AdminStore = require('../../stores/admin_store.jsx'); -var LoadingScreen = require('../loading_screen.jsx'); -var AsyncClient = require('../../utils/async_client.jsx'); +import AdminStore from '../../stores/admin_store.jsx'; +import LoadingScreen from '../loading_screen.jsx'; +import * as AsyncClient from '../../utils/async_client.jsx'; export default class Logs extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/privacy_settings.jsx b/web/react/components/admin_console/privacy_settings.jsx index f2d22f36e..61393f1c6 100644 --- a/web/react/components/admin_console/privacy_settings.jsx +++ b/web/react/components/admin_console/privacy_settings.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../../utils/client.jsx'); -var AsyncClient = require('../../utils/async_client.jsx'); +import * as Client from '../../utils/client.jsx'; +import * as AsyncClient from '../../utils/async_client.jsx'; export default class PrivacySettings extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/rate_settings.jsx b/web/react/components/admin_console/rate_settings.jsx index 4d71777c4..ca9fcb074 100644 --- a/web/react/components/admin_console/rate_settings.jsx +++ b/web/react/components/admin_console/rate_settings.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../../utils/client.jsx'); -var AsyncClient = require('../../utils/async_client.jsx'); +import * as Client from '../../utils/client.jsx'; +import * as AsyncClient from '../../utils/async_client.jsx'; export default class RateSettings extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/reset_password_modal.jsx b/web/react/components/admin_console/reset_password_modal.jsx index 35d3cdd17..5ff7c3413 100644 --- a/web/react/components/admin_console/reset_password_modal.jsx +++ b/web/react/components/admin_console/reset_password_modal.jsx @@ -1,7 +1,7 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../../utils/client.jsx'); +import * as Client from '../../utils/client.jsx'; var Modal = ReactBootstrap.Modal; export default class ResetPasswordModal extends React.Component { diff --git a/web/react/components/admin_console/service_settings.jsx b/web/react/components/admin_console/service_settings.jsx index 53c89a942..908eb709a 100644 --- a/web/react/components/admin_console/service_settings.jsx +++ b/web/react/components/admin_console/service_settings.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../../utils/client.jsx'); -var AsyncClient = require('../../utils/async_client.jsx'); +import * as Client from '../../utils/client.jsx'; +import * as AsyncClient from '../../utils/async_client.jsx'; export default class ServiceSettings extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/sql_settings.jsx b/web/react/components/admin_console/sql_settings.jsx index b43108bf7..2a55f7324 100644 --- a/web/react/components/admin_console/sql_settings.jsx +++ b/web/react/components/admin_console/sql_settings.jsx @@ -1,9 +1,9 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../../utils/client.jsx'); -var AsyncClient = require('../../utils/async_client.jsx'); -var crypto = require('crypto'); +import * as Client from '../../utils/client.jsx'; +import * as AsyncClient from '../../utils/async_client.jsx'; +import crypto from 'crypto'; export default class SqlSettings extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/team_analytics.jsx b/web/react/components/admin_console/team_analytics.jsx index 0c9d1f61b..6c8e63c83 100644 --- a/web/react/components/admin_console/team_analytics.jsx +++ b/web/react/components/admin_console/team_analytics.jsx @@ -1,9 +1,9 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../../utils/client.jsx'); -var Utils = require('../../utils/utils.jsx'); -var LineChart = require('./line_chart.jsx'); +import * as Client from '../../utils/client.jsx'; +import * as Utils from '../../utils/utils.jsx'; +import LineChart from './line_chart.jsx'; export default class TeamAnalytics extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/team_settings.jsx b/web/react/components/admin_console/team_settings.jsx index 6587184ea..7991b9a01 100644 --- a/web/react/components/admin_console/team_settings.jsx +++ b/web/react/components/admin_console/team_settings.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../../utils/client.jsx'); -var AsyncClient = require('../../utils/async_client.jsx'); +import * as Client from '../../utils/client.jsx'; +import * as AsyncClient from '../../utils/async_client.jsx'; export default class TeamSettings extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/team_users.jsx b/web/react/components/admin_console/team_users.jsx index 7161139e6..2d9657956 100644 --- a/web/react/components/admin_console/team_users.jsx +++ b/web/react/components/admin_console/team_users.jsx @@ -1,10 +1,10 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../../utils/client.jsx'); -var LoadingScreen = require('../loading_screen.jsx'); -var UserItem = require('./user_item.jsx'); -var ResetPasswordModal = require('./reset_password_modal.jsx'); +import * as Client from '../../utils/client.jsx'; +import LoadingScreen from '../loading_screen.jsx'; +import UserItem from './user_item.jsx'; +import ResetPasswordModal from './reset_password_modal.jsx'; export default class UserList extends React.Component { constructor(props) { diff --git a/web/react/components/admin_console/user_item.jsx b/web/react/components/admin_console/user_item.jsx index 2badaf0e5..bd64564c9 100644 --- a/web/react/components/admin_console/user_item.jsx +++ b/web/react/components/admin_console/user_item.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../../utils/client.jsx'); -var Utils = require('../../utils/utils.jsx'); +import * as Client from '../../utils/client.jsx'; +import * as Utils from '../../utils/utils.jsx'; export default class UserItem extends React.Component { constructor(props) { diff --git a/web/react/components/authorize.jsx b/web/react/components/authorize.jsx index 74709bcab..32e39fbff 100644 --- a/web/react/components/authorize.jsx +++ b/web/react/components/authorize.jsx @@ -1,7 +1,7 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../utils/client.jsx'); +import * as Client from '../utils/client.jsx'; export default class Authorize extends React.Component { constructor(props) { diff --git a/web/react/components/center_panel.jsx b/web/react/components/center_panel.jsx index 3ee40bb86..c2ecf4fa2 100644 --- a/web/react/components/center_panel.jsx +++ b/web/react/components/center_panel.jsx @@ -1,17 +1,17 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const TutorialIntroScreens = require('./tutorial/tutorial_intro_screens.jsx'); -const CreatePost = require('./create_post.jsx'); -const PostsViewContainer = require('./posts_view_container.jsx'); -const ChannelHeader = require('./channel_header.jsx'); -const Navbar = require('./navbar.jsx'); -const FileUploadOverlay = require('./file_upload_overlay.jsx'); +import TutorialIntroScreens from './tutorial/tutorial_intro_screens.jsx'; +import CreatePost from './create_post.jsx'; +import PostsViewContainer from './posts_view_container.jsx'; +import ChannelHeader from './channel_header.jsx'; +import Navbar from './navbar.jsx'; +import FileUploadOverlay from './file_upload_overlay.jsx'; -const PreferenceStore = require('../stores/preference_store.jsx'); -const UserStore = require('../stores/user_store.jsx'); +import PreferenceStore from '../stores/preference_store.jsx'; +import UserStore from '../stores/user_store.jsx'; -const Constants = require('../utils/constants.jsx'); +import Constants from '../utils/constants.jsx'; const TutorialSteps = Constants.TutorialSteps; const Preferences = Constants.Preferences; diff --git a/web/react/components/change_url_modal.jsx b/web/react/components/change_url_modal.jsx index 714e93ff8..bbe93f58d 100644 --- a/web/react/components/change_url_modal.jsx +++ b/web/react/components/change_url_modal.jsx @@ -2,7 +2,7 @@ // See License.txt for license information. var Modal = ReactBootstrap.Modal; -var Utils = require('../utils/utils.jsx'); +import * as Utils from '../utils/utils.jsx'; export default class ChangeUrlModal extends React.Component { constructor(props) { diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx index e46b2ccd7..8c721348f 100644 --- a/web/react/components/channel_header.jsx +++ b/web/react/components/channel_header.jsx @@ -1,28 +1,28 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const NavbarSearchBox = require('./search_bar.jsx'); -const MessageWrapper = require('./message_wrapper.jsx'); -const PopoverListMembers = require('./popover_list_members.jsx'); -const EditChannelPurposeModal = require('./edit_channel_purpose_modal.jsx'); -const ChannelInfoModal = require('./channel_info_modal.jsx'); -const ChannelInviteModal = require('./channel_invite_modal.jsx'); -const ChannelMembersModal = require('./channel_members_modal.jsx'); -const ChannelNotificationsModal = require('./channel_notifications_modal.jsx'); -const DeleteChannelModal = require('./delete_channel_modal.jsx'); -const ToggleModalButton = require('./toggle_modal_button.jsx'); +import NavbarSearchBox from './search_bar.jsx'; +import MessageWrapper from './message_wrapper.jsx'; +import PopoverListMembers from './popover_list_members.jsx'; +import EditChannelPurposeModal from './edit_channel_purpose_modal.jsx'; +import ChannelInfoModal from './channel_info_modal.jsx'; +import ChannelInviteModal from './channel_invite_modal.jsx'; +import ChannelMembersModal from './channel_members_modal.jsx'; +import ChannelNotificationsModal from './channel_notifications_modal.jsx'; +import DeleteChannelModal from './delete_channel_modal.jsx'; +import ToggleModalButton from './toggle_modal_button.jsx'; -const ChannelStore = require('../stores/channel_store.jsx'); -const UserStore = require('../stores/user_store.jsx'); -const SearchStore = require('../stores/search_store.jsx'); -const PreferenceStore = require('../stores/preference_store.jsx'); +import ChannelStore from '../stores/channel_store.jsx'; +import UserStore from '../stores/user_store.jsx'; +import SearchStore from '../stores/search_store.jsx'; +import PreferenceStore from '../stores/preference_store.jsx'; -const AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); -const Utils = require('../utils/utils.jsx'); -const TextFormatting = require('../utils/text_formatting.jsx'); -const AsyncClient = require('../utils/async_client.jsx'); -const Client = require('../utils/client.jsx'); -const Constants = require('../utils/constants.jsx'); +import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; +import * as Utils from '../utils/utils.jsx'; +import * as TextFormatting from '../utils/text_formatting.jsx'; +import * as AsyncClient from '../utils/async_client.jsx'; +import * as Client from '../utils/client.jsx'; +import Constants from '../utils/constants.jsx'; const ActionTypes = Constants.ActionTypes; const Popover = ReactBootstrap.Popover; diff --git a/web/react/components/channel_invite_modal.jsx b/web/react/components/channel_invite_modal.jsx index 47bc50971..6d3203ae5 100644 --- a/web/react/components/channel_invite_modal.jsx +++ b/web/react/components/channel_invite_modal.jsx @@ -1,15 +1,15 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const MemberList = require('./member_list.jsx'); -const LoadingScreen = require('./loading_screen.jsx'); +import MemberList from './member_list.jsx'; +import LoadingScreen from './loading_screen.jsx'; -const UserStore = require('../stores/user_store.jsx'); -const ChannelStore = require('../stores/channel_store.jsx'); +import UserStore from '../stores/user_store.jsx'; +import ChannelStore from '../stores/channel_store.jsx'; -const Utils = require('../utils/utils.jsx'); -const Client = require('../utils/client.jsx'); -const AsyncClient = require('../utils/async_client.jsx'); +import * as Utils from '../utils/utils.jsx'; +import * as Client from '../utils/client.jsx'; +import * as AsyncClient from '../utils/async_client.jsx'; const Modal = ReactBootstrap.Modal; diff --git a/web/react/components/channel_loader.jsx b/web/react/components/channel_loader.jsx index 4fc115a92..e29c659c7 100644 --- a/web/react/components/channel_loader.jsx +++ b/web/react/components/channel_loader.jsx @@ -5,14 +5,14 @@ to the server on page load. This is to prevent other React controls from spamming AsyncClient with requests. */ -var AsyncClient = require('../utils/async_client.jsx'); -var SocketStore = require('../stores/socket_store.jsx'); -var ChannelStore = require('../stores/channel_store.jsx'); -var PostStore = require('../stores/post_store.jsx'); -var UserStore = require('../stores/user_store.jsx'); - -var Utils = require('../utils/utils.jsx'); -var Constants = require('../utils/constants.jsx'); +import * as AsyncClient from '../utils/async_client.jsx'; +import SocketStore from '../stores/socket_store.jsx'; +import ChannelStore from '../stores/channel_store.jsx'; +import PostStore from '../stores/post_store.jsx'; +import UserStore from '../stores/user_store.jsx'; + +import * as Utils from '../utils/utils.jsx'; +import Constants from '../utils/constants.jsx'; export default class ChannelLoader extends React.Component { constructor(props) { diff --git a/web/react/components/channel_members_modal.jsx b/web/react/components/channel_members_modal.jsx index 5cf3511f4..08ad95091 100644 --- a/web/react/components/channel_members_modal.jsx +++ b/web/react/components/channel_members_modal.jsx @@ -1,15 +1,15 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const MemberList = require('./member_list.jsx'); -const ChannelInviteModal = require('./channel_invite_modal.jsx'); +import MemberList from './member_list.jsx'; +import ChannelInviteModal from './channel_invite_modal.jsx'; -const UserStore = require('../stores/user_store.jsx'); -const ChannelStore = require('../stores/channel_store.jsx'); +import UserStore from '../stores/user_store.jsx'; +import ChannelStore from '../stores/channel_store.jsx'; -const AsyncClient = require('../utils/async_client.jsx'); -const Client = require('../utils/client.jsx'); -const Utils = require('../utils/utils.jsx'); +import * as AsyncClient from '../utils/async_client.jsx'; +import * as Client from '../utils/client.jsx'; +import * as Utils from '../utils/utils.jsx'; const Modal = ReactBootstrap.Modal; diff --git a/web/react/components/channel_notifications_modal.jsx b/web/react/components/channel_notifications_modal.jsx index c8bd1c2dc..4af95c88f 100644 --- a/web/react/components/channel_notifications_modal.jsx +++ b/web/react/components/channel_notifications_modal.jsx @@ -2,12 +2,12 @@ // See License.txt for license information. var Modal = ReactBootstrap.Modal; -var SettingItemMin = require('./setting_item_min.jsx'); -var SettingItemMax = require('./setting_item_max.jsx'); +import SettingItemMin from './setting_item_min.jsx'; +import SettingItemMax from './setting_item_max.jsx'; -var Client = require('../utils/client.jsx'); -var UserStore = require('../stores/user_store.jsx'); -var ChannelStore = require('../stores/channel_store.jsx'); +import * as Client from '../utils/client.jsx'; +import UserStore from '../stores/user_store.jsx'; +import ChannelStore from '../stores/channel_store.jsx'; export default class ChannelNotificationsModal extends React.Component { constructor(props) { diff --git a/web/react/components/channel_view.jsx b/web/react/components/channel_view.jsx index 3f53a94c2..7cbb638a0 100644 --- a/web/react/components/channel_view.jsx +++ b/web/react/components/channel_view.jsx @@ -1,10 +1,10 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const CenterPanel = require('../components/center_panel.jsx'); -const Sidebar = require('../components/sidebar.jsx'); -const SidebarRight = require('../components/sidebar_right.jsx'); -const SidebarRightMenu = require('../components/sidebar_right_menu.jsx'); +import CenterPanel from '../components/center_panel.jsx'; +import Sidebar from '../components/sidebar.jsx'; +import SidebarRight from '../components/sidebar_right.jsx'; +import SidebarRightMenu from '../components/sidebar_right_menu.jsx'; export default class ChannelView extends React.Component { constructor(props) { diff --git a/web/react/components/command_list.jsx b/web/react/components/command_list.jsx index 9b479b973..ff83d0420 100644 --- a/web/react/components/command_list.jsx +++ b/web/react/components/command_list.jsx @@ -1,7 +1,7 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var client = require('../utils/client.jsx'); +import * as client from '../utils/client.jsx'; export default class CommandList extends React.Component { constructor(props) { diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx index 22a659ed5..8ceda1cf7 100644 --- a/web/react/components/create_comment.jsx +++ b/web/react/components/create_comment.jsx @@ -1,21 +1,21 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); -const Client = require('../utils/client.jsx'); -const AsyncClient = require('../utils/async_client.jsx'); -const SocketStore = require('../stores/socket_store.jsx'); -const ChannelStore = require('../stores/channel_store.jsx'); -const UserStore = require('../stores/user_store.jsx'); -const PostStore = require('../stores/post_store.jsx'); -const PreferenceStore = require('../stores/preference_store.jsx'); -const Textbox = require('./textbox.jsx'); -const MsgTyping = require('./msg_typing.jsx'); -const FileUpload = require('./file_upload.jsx'); -const FilePreview = require('./file_preview.jsx'); -const Utils = require('../utils/utils.jsx'); - -const Constants = require('../utils/constants.jsx'); +import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; +import * as Client from '../utils/client.jsx'; +import * as AsyncClient from '../utils/async_client.jsx'; +import SocketStore from '../stores/socket_store.jsx'; +import ChannelStore from '../stores/channel_store.jsx'; +import UserStore from '../stores/user_store.jsx'; +import PostStore from '../stores/post_store.jsx'; +import PreferenceStore from '../stores/preference_store.jsx'; +import Textbox from './textbox.jsx'; +import MsgTyping from './msg_typing.jsx'; +import FileUpload from './file_upload.jsx'; +import FilePreview from './file_preview.jsx'; +import * as Utils from '../utils/utils.jsx'; + +import Constants from '../utils/constants.jsx'; const ActionTypes = Constants.ActionTypes; const KeyCodes = Constants.KeyCodes; diff --git a/web/react/components/create_post.jsx b/web/react/components/create_post.jsx index d823a54f1..0a2979e21 100644 --- a/web/react/components/create_post.jsx +++ b/web/react/components/create_post.jsx @@ -1,24 +1,24 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const MsgTyping = require('./msg_typing.jsx'); -const Textbox = require('./textbox.jsx'); -const FileUpload = require('./file_upload.jsx'); -const FilePreview = require('./file_preview.jsx'); -const TutorialTip = require('./tutorial/tutorial_tip.jsx'); - -const AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); -const Client = require('../utils/client.jsx'); -const AsyncClient = require('../utils/async_client.jsx'); -const Utils = require('../utils/utils.jsx'); - -const ChannelStore = require('../stores/channel_store.jsx'); -const PostStore = require('../stores/post_store.jsx'); -const UserStore = require('../stores/user_store.jsx'); -const PreferenceStore = require('../stores/preference_store.jsx'); -const SocketStore = require('../stores/socket_store.jsx'); - -const Constants = require('../utils/constants.jsx'); +import MsgTyping from './msg_typing.jsx'; +import Textbox from './textbox.jsx'; +import FileUpload from './file_upload.jsx'; +import FilePreview from './file_preview.jsx'; +import TutorialTip from './tutorial/tutorial_tip.jsx'; + +import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; +import * as Client from '../utils/client.jsx'; +import * as AsyncClient from '../utils/async_client.jsx'; +import * as Utils from '../utils/utils.jsx'; + +import ChannelStore from '../stores/channel_store.jsx'; +import PostStore from '../stores/post_store.jsx'; +import UserStore from '../stores/user_store.jsx'; +import PreferenceStore from '../stores/preference_store.jsx'; +import SocketStore from '../stores/socket_store.jsx'; + +import Constants from '../utils/constants.jsx'; const Preferences = Constants.Preferences; const TutorialSteps = Constants.TutorialSteps; const ActionTypes = Constants.ActionTypes; diff --git a/web/react/components/delete_channel_modal.jsx b/web/react/components/delete_channel_modal.jsx index 271f21c3a..99bae962a 100644 --- a/web/react/components/delete_channel_modal.jsx +++ b/web/react/components/delete_channel_modal.jsx @@ -1,11 +1,11 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const AsyncClient = require('../utils/async_client.jsx'); -const Client = require('../utils/client.jsx'); +import * as AsyncClient from '../utils/async_client.jsx'; +import * as Client from '../utils/client.jsx'; const Modal = ReactBootstrap.Modal; -const TeamStore = require('../stores/team_store.jsx'); -const Utils = require('../utils/utils.jsx'); +import TeamStore from '../stores/team_store.jsx'; +import * as Utils from '../utils/utils.jsx'; export default class DeleteChannelModal extends React.Component { constructor(props) { diff --git a/web/react/components/delete_post_modal.jsx b/web/react/components/delete_post_modal.jsx index e0489856f..fab5b60ea 100644 --- a/web/react/components/delete_post_modal.jsx +++ b/web/react/components/delete_post_modal.jsx @@ -1,14 +1,14 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../utils/client.jsx'); -var PostStore = require('../stores/post_store.jsx'); -var ModalStore = require('../stores/modal_store.jsx'); +import * as Client from '../utils/client.jsx'; +import PostStore from '../stores/post_store.jsx'; +import ModalStore from '../stores/modal_store.jsx'; var Modal = ReactBootstrap.Modal; -var Utils = require('../utils/utils.jsx'); -var AsyncClient = require('../utils/async_client.jsx'); -var AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); -var Constants = require('../utils/constants.jsx'); +import * as Utils from '../utils/utils.jsx'; +import * as AsyncClient from '../utils/async_client.jsx'; +import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; +import Constants from '../utils/constants.jsx'; var ActionTypes = Constants.ActionTypes; export default class DeletePostModal extends React.Component { diff --git a/web/react/components/docs.jsx b/web/react/components/docs.jsx index 68baa6dad..188ca340b 100644 --- a/web/react/components/docs.jsx +++ b/web/react/components/docs.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const TextFormatting = require('../utils/text_formatting.jsx'); -const UserStore = require('../stores/user_store.jsx'); +import * as TextFormatting from '../utils/text_formatting.jsx'; +import UserStore from '../stores/user_store.jsx'; export default class Docs extends React.Component { constructor(props) { diff --git a/web/react/components/edit_channel_modal.jsx b/web/react/components/edit_channel_modal.jsx index 2557a55ca..80dab4a57 100644 --- a/web/react/components/edit_channel_modal.jsx +++ b/web/react/components/edit_channel_modal.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const Client = require('../utils/client.jsx'); -const AsyncClient = require('../utils/async_client.jsx'); +import * as Client from '../utils/client.jsx'; +import * as AsyncClient from '../utils/async_client.jsx'; export default class EditChannelModal extends React.Component { constructor(props) { diff --git a/web/react/components/edit_channel_purpose_modal.jsx b/web/react/components/edit_channel_purpose_modal.jsx index 65e8183de..3cc177b24 100644 --- a/web/react/components/edit_channel_purpose_modal.jsx +++ b/web/react/components/edit_channel_purpose_modal.jsx @@ -1,9 +1,9 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const AsyncClient = require('../utils/async_client.jsx'); -const Client = require('../utils/client.jsx'); -const Utils = require('../utils/utils.jsx'); +import * as AsyncClient from '../utils/async_client.jsx'; +import * as Client from '../utils/client.jsx'; +import * as Utils from '../utils/utils.jsx'; const Modal = ReactBootstrap.Modal; diff --git a/web/react/components/edit_post_modal.jsx b/web/react/components/edit_post_modal.jsx index c75da75c9..ddbdee8a4 100644 --- a/web/react/components/edit_post_modal.jsx +++ b/web/react/components/edit_post_modal.jsx @@ -1,15 +1,15 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../utils/client.jsx'); -var AsyncClient = require('../utils/async_client.jsx'); -var DeletePostModal = require('./delete_post_modal.jsx'); -var Textbox = require('./textbox.jsx'); -var BrowserStore = require('../stores/browser_store.jsx'); -var PostStore = require('../stores/post_store.jsx'); -var PreferenceStore = require('../stores/preference_store.jsx'); - -var Constants = require('../utils/constants.jsx'); +import * as Client from '../utils/client.jsx'; +import * as AsyncClient from '../utils/async_client.jsx'; +import DeletePostModal from './delete_post_modal.jsx'; +import Textbox from './textbox.jsx'; +import BrowserStore from '../stores/browser_store.jsx'; +import PostStore from '../stores/post_store.jsx'; +import PreferenceStore from '../stores/preference_store.jsx'; + +import Constants from '../utils/constants.jsx'; var KeyCodes = Constants.KeyCodes; export default class EditPostModal extends React.Component { diff --git a/web/react/components/error_bar.jsx b/web/react/components/error_bar.jsx index f098384aa..921e8afe1 100644 --- a/web/react/components/error_bar.jsx +++ b/web/react/components/error_bar.jsx @@ -1,7 +1,7 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var ErrorStore = require('../stores/error_store.jsx'); +import ErrorStore from '../stores/error_store.jsx'; export default class ErrorBar extends React.Component { constructor() { diff --git a/web/react/components/file_attachment.jsx b/web/react/components/file_attachment.jsx index d6a30abf9..2474b3d8a 100644 --- a/web/react/components/file_attachment.jsx +++ b/web/react/components/file_attachment.jsx @@ -1,9 +1,9 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var utils = require('../utils/utils.jsx'); -var Client = require('../utils/client.jsx'); -var Constants = require('../utils/constants.jsx'); +import * as utils from '../utils/utils.jsx'; +import * as Client from '../utils/client.jsx'; +import Constants from '../utils/constants.jsx'; export default class FileAttachment extends React.Component { constructor(props) { diff --git a/web/react/components/file_attachment_list.jsx b/web/react/components/file_attachment_list.jsx index ae08e5635..da1b2ba3d 100644 --- a/web/react/components/file_attachment_list.jsx +++ b/web/react/components/file_attachment_list.jsx @@ -1,9 +1,9 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var ViewImageModal = require('./view_image.jsx'); -var FileAttachment = require('./file_attachment.jsx'); -var Constants = require('../utils/constants.jsx'); +import ViewImageModal from './view_image.jsx'; +import FileAttachment from './file_attachment.jsx'; +import Constants from '../utils/constants.jsx'; export default class FileAttachmentList extends React.Component { constructor(props) { diff --git a/web/react/components/file_preview.jsx b/web/react/components/file_preview.jsx index b8c86ed67..d625a811e 100644 --- a/web/react/components/file_preview.jsx +++ b/web/react/components/file_preview.jsx @@ -1,7 +1,7 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Utils = require('../utils/utils.jsx'); +import * as Utils from '../utils/utils.jsx'; export default class FilePreview extends React.Component { constructor(props) { diff --git a/web/react/components/file_upload.jsx b/web/react/components/file_upload.jsx index 8854a54df..9316ca9a5 100644 --- a/web/react/components/file_upload.jsx +++ b/web/react/components/file_upload.jsx @@ -1,10 +1,10 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var client = require('../utils/client.jsx'); -var Constants = require('../utils/constants.jsx'); -var ChannelStore = require('../stores/channel_store.jsx'); -var utils = require('../utils/utils.jsx'); +import * as client from '../utils/client.jsx'; +import Constants from '../utils/constants.jsx'; +import ChannelStore from '../stores/channel_store.jsx'; +import * as utils from '../utils/utils.jsx'; export default class FileUpload extends React.Component { constructor(props) { diff --git a/web/react/components/find_team.jsx b/web/react/components/find_team.jsx index bd3c11973..94ca48dbf 100644 --- a/web/react/components/find_team.jsx +++ b/web/react/components/find_team.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var utils = require('../utils/utils.jsx'); -var client = require('../utils/client.jsx'); +import * as utils from '../utils/utils.jsx'; +import * as client from '../utils/client.jsx'; export default class FindTeam extends React.Component { constructor(props) { diff --git a/web/react/components/get_link_modal.jsx b/web/react/components/get_link_modal.jsx index 8839bc3c7..2bd2c42d6 100644 --- a/web/react/components/get_link_modal.jsx +++ b/web/react/components/get_link_modal.jsx @@ -1,7 +1,7 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var UserStore = require('../stores/user_store.jsx'); +import UserStore from '../stores/user_store.jsx'; export default class GetLinkModal extends React.Component { constructor(props) { diff --git a/web/react/components/invite_member_modal.jsx b/web/react/components/invite_member_modal.jsx index 3f6ad3358..7df75252e 100644 --- a/web/react/components/invite_member_modal.jsx +++ b/web/react/components/invite_member_modal.jsx @@ -1,14 +1,15 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var utils = require('../utils/utils.jsx'); -var ActionTypes = require('../utils/constants.jsx').ActionTypes; -var AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); -var Client = require('../utils/client.jsx'); -var ModalStore = require('../stores/modal_store.jsx'); -var UserStore = require('../stores/user_store.jsx'); -var TeamStore = require('../stores/team_store.jsx'); -var ConfirmModal = require('./confirm_modal.jsx'); +import * as utils from '../utils/utils.jsx'; +import Constants from '../utils/constants.jsx'; +const ActionTypes = Constants.ActionTypes; +import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; +import * as Client from '../utils/client.jsx'; +import ModalStore from '../stores/modal_store.jsx'; +import UserStore from '../stores/user_store.jsx'; +import TeamStore from '../stores/team_store.jsx'; +import ConfirmModal from './confirm_modal.jsx'; const Modal = ReactBootstrap.Modal; diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx index 7f8820d9f..d87bd20ad 100644 --- a/web/react/components/login.jsx +++ b/web/react/components/login.jsx @@ -1,10 +1,10 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const Utils = require('../utils/utils.jsx'); -const Client = require('../utils/client.jsx'); -const UserStore = require('../stores/user_store.jsx'); -const BrowserStore = require('../stores/browser_store.jsx'); +import * as Utils from '../utils/utils.jsx'; +import * as Client from '../utils/client.jsx'; +import UserStore from '../stores/user_store.jsx'; +import BrowserStore from '../stores/browser_store.jsx'; export default class Login extends React.Component { constructor(props) { diff --git a/web/react/components/member_list.jsx b/web/react/components/member_list.jsx index 0238c7920..8c6dc4209 100644 --- a/web/react/components/member_list.jsx +++ b/web/react/components/member_list.jsx @@ -1,7 +1,7 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var MemberListItem = require('./member_list_item.jsx'); +import MemberListItem from './member_list_item.jsx'; export default class MemberList extends React.Component { constructor(props) { diff --git a/web/react/components/member_list_item.jsx b/web/react/components/member_list_item.jsx index 8251d67bc..390d25f2e 100644 --- a/web/react/components/member_list_item.jsx +++ b/web/react/components/member_list_item.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var UserStore = require('../stores/user_store.jsx'); -const Utils = require('../utils/utils.jsx'); +import UserStore from '../stores/user_store.jsx'; +import * as Utils from '../utils/utils.jsx'; export default class MemberListItem extends React.Component { constructor(props) { diff --git a/web/react/components/member_list_team.jsx b/web/react/components/member_list_team.jsx index cb2d0660b..72fdb7be9 100644 --- a/web/react/components/member_list_team.jsx +++ b/web/react/components/member_list_team.jsx @@ -1,7 +1,7 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const MemberListTeamItem = require('./member_list_team_item.jsx'); +import MemberListTeamItem from './member_list_team_item.jsx'; export default class MemberListTeam extends React.Component { render() { diff --git a/web/react/components/member_list_team_item.jsx b/web/react/components/member_list_team_item.jsx index 1fa369068..27fb6a4c1 100644 --- a/web/react/components/member_list_team_item.jsx +++ b/web/react/components/member_list_team_item.jsx @@ -1,10 +1,10 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const UserStore = require('../stores/user_store.jsx'); -const Client = require('../utils/client.jsx'); -const AsyncClient = require('../utils/async_client.jsx'); -const Utils = require('../utils/utils.jsx'); +import UserStore from '../stores/user_store.jsx'; +import * as Client from '../utils/client.jsx'; +import * as AsyncClient from '../utils/async_client.jsx'; +import * as Utils from '../utils/utils.jsx'; export default class MemberListTeamItem extends React.Component { constructor(props) { diff --git a/web/react/components/mention.jsx b/web/react/components/mention.jsx index 050887c6f..44f6210e4 100644 --- a/web/react/components/mention.jsx +++ b/web/react/components/mention.jsx @@ -1,7 +1,7 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var UserStore = require('../stores/user_store.jsx'); -const Utils = require('../utils/utils.jsx'); +import UserStore from '../stores/user_store.jsx'; +import * as Utils from '../utils/utils.jsx'; export default class Mention extends React.Component { constructor(props) { diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx index 61a24c09c..d1b27cf99 100644 --- a/web/react/components/mention_list.jsx +++ b/web/react/components/mention_list.jsx @@ -1,13 +1,13 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var UserStore = require('../stores/user_store.jsx'); -var SearchStore = require('../stores/search_store.jsx'); -var AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); -var Mention = require('./mention.jsx'); +import UserStore from '../stores/user_store.jsx'; +import SearchStore from '../stores/search_store.jsx'; +import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; +import Mention from './mention.jsx'; -var Constants = require('../utils/constants.jsx'); -var Utils = require('../utils/utils.jsx'); +import Constants from '../utils/constants.jsx'; +import * as Utils from '../utils/utils.jsx'; var ActionTypes = Constants.ActionTypes; var MAX_HEIGHT_LIST = 292; diff --git a/web/react/components/message_wrapper.jsx b/web/react/components/message_wrapper.jsx index 00c427c79..8e0380c06 100644 --- a/web/react/components/message_wrapper.jsx +++ b/web/react/components/message_wrapper.jsx @@ -1,7 +1,7 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var TextFormatting = require('../utils/text_formatting.jsx'); +import * as TextFormatting from '../utils/text_formatting.jsx'; export default class MessageWrapper extends React.Component { constructor(props) { diff --git a/web/react/components/more_channels.jsx b/web/react/components/more_channels.jsx index 8a6dd84a4..29512b9b7 100644 --- a/web/react/components/more_channels.jsx +++ b/web/react/components/more_channels.jsx @@ -1,12 +1,12 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var utils = require('../utils/utils.jsx'); -var client = require('../utils/client.jsx'); -var asyncClient = require('../utils/async_client.jsx'); -var ChannelStore = require('../stores/channel_store.jsx'); -var LoadingScreen = require('./loading_screen.jsx'); -var NewChannelFlow = require('./new_channel_flow.jsx'); +import * as utils from '../utils/utils.jsx'; +import * as client from '../utils/client.jsx'; +import * as AsyncClient from '../utils/async_client.jsx'; +import ChannelStore from '../stores/channel_store.jsx'; +import LoadingScreen from './loading_screen.jsx'; +import NewChannelFlow from './new_channel_flow.jsx'; function getStateFromStores() { return { @@ -31,12 +31,12 @@ export default class MoreChannels extends React.Component { } componentDidMount() { ChannelStore.addMoreChangeListener(this.onListenerChange); - $(ReactDOM.findDOMNode(this.refs.modal)).on('shown.bs.modal', function shown() { - asyncClient.getMoreChannels(true); + $(ReactDOM.findDOMNode(this.refs.modal)).on('shown.bs.modal', () => { + AsyncClient.getMoreChannels(true); }); var self = this; - $(ReactDOM.findDOMNode(this.refs.modal)).on('show.bs.modal', function show(e) { + $(ReactDOM.findDOMNode(this.refs.modal)).on('show.bs.modal', (e) => { var button = e.relatedTarget; self.setState({channelType: $(button).attr('data-channeltype')}); }); @@ -53,15 +53,15 @@ export default class MoreChannels extends React.Component { handleJoin(channel, channelIndex) { this.setState({joiningChannel: channelIndex}); client.joinChannel(channel.id, - function joinSuccess() { + () => { $(ReactDOM.findDOMNode(this.refs.modal)).modal('hide'); - asyncClient.getChannel(channel.id); + AsyncClient.getChannel(channel.id); utils.switchChannel(channel); this.setState({joiningChannel: -1}); - }.bind(this), - function joinFail(err) { + }, + (err) => { this.setState({joiningChannel: -1, serverError: err.message}); - }.bind(this) + } ); } handleNewChannel() { diff --git a/web/react/components/more_direct_channels.jsx b/web/react/components/more_direct_channels.jsx index d1265f67e..9116dc8f1 100644 --- a/web/react/components/more_direct_channels.jsx +++ b/web/react/components/more_direct_channels.jsx @@ -2,8 +2,8 @@ // See License.txt for license information. const Modal = ReactBootstrap.Modal; -const UserStore = require('../stores/user_store.jsx'); -const Utils = require('../utils/utils.jsx'); +import UserStore from '../stores/user_store.jsx'; +import * as Utils from '../utils/utils.jsx'; export default class MoreDirectChannels extends React.Component { constructor(props) { diff --git a/web/react/components/msg_typing.jsx b/web/react/components/msg_typing.jsx index eed85ade6..78b67a216 100644 --- a/web/react/components/msg_typing.jsx +++ b/web/react/components/msg_typing.jsx @@ -1,10 +1,10 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const SocketStore = require('../stores/socket_store.jsx'); -const UserStore = require('../stores/user_store.jsx'); +import SocketStore from '../stores/socket_store.jsx'; +import UserStore from '../stores/user_store.jsx'; -const Constants = require('../utils/constants.jsx'); +import Constants from '../utils/constants.jsx'; const SocketEvents = Constants.SocketEvents; export default class MsgTyping extends React.Component { diff --git a/web/react/components/navbar.jsx b/web/react/components/navbar.jsx index 845c33f3b..6848ee5da 100644 --- a/web/react/components/navbar.jsx +++ b/web/react/components/navbar.jsx @@ -1,27 +1,27 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const EditChannelPurposeModal = require('./edit_channel_purpose_modal.jsx'); -const MessageWrapper = require('./message_wrapper.jsx'); -const NotifyCounts = require('./notify_counts.jsx'); -const ChannelMembersModal = require('./channel_members_modal.jsx'); -const ChannelInfoModal = require('./channel_info_modal.jsx'); -const ChannelInviteModal = require('./channel_invite_modal.jsx'); -const ChannelNotificationsModal = require('./channel_notifications_modal.jsx'); -const DeleteChannelModal = require('./delete_channel_modal.jsx'); -const ToggleModalButton = require('./toggle_modal_button.jsx'); +import EditChannelPurposeModal from './edit_channel_purpose_modal.jsx'; +import MessageWrapper from './message_wrapper.jsx'; +import NotifyCounts from './notify_counts.jsx'; +import ChannelMembersModal from './channel_members_modal.jsx'; +import ChannelInfoModal from './channel_info_modal.jsx'; +import ChannelInviteModal from './channel_invite_modal.jsx'; +import ChannelNotificationsModal from './channel_notifications_modal.jsx'; +import DeleteChannelModal from './delete_channel_modal.jsx'; +import ToggleModalButton from './toggle_modal_button.jsx'; -const UserStore = require('../stores/user_store.jsx'); -const ChannelStore = require('../stores/channel_store.jsx'); -const TeamStore = require('../stores/team_store.jsx'); +import UserStore from '../stores/user_store.jsx'; +import ChannelStore from '../stores/channel_store.jsx'; +import TeamStore from '../stores/team_store.jsx'; -const Client = require('../utils/client.jsx'); -const AsyncClient = require('../utils/async_client.jsx'); -const Utils = require('../utils/utils.jsx'); +import * as Client from '../utils/client.jsx'; +import * as AsyncClient from '../utils/async_client.jsx'; +import * as Utils from '../utils/utils.jsx'; -const Constants = require('../utils/constants.jsx'); +import Constants from '../utils/constants.jsx'; const ActionTypes = Constants.ActionTypes; -const AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); +import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; const Popover = ReactBootstrap.Popover; const OverlayTrigger = ReactBootstrap.OverlayTrigger; diff --git a/web/react/components/navbar_dropdown.jsx b/web/react/components/navbar_dropdown.jsx index cf9db055d..c0230fe5f 100644 --- a/web/react/components/navbar_dropdown.jsx +++ b/web/react/components/navbar_dropdown.jsx @@ -1,16 +1,16 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Utils = require('../utils/utils.jsx'); -var client = require('../utils/client.jsx'); -var UserStore = require('../stores/user_store.jsx'); -var TeamStore = require('../stores/team_store.jsx'); +import * as Utils from '../utils/utils.jsx'; +import * as client from '../utils/client.jsx'; +import UserStore from '../stores/user_store.jsx'; +import TeamStore from '../stores/team_store.jsx'; -var AboutBuildModal = require('./about_build_modal.jsx'); -var InviteMemberModal = require('./invite_member_modal.jsx'); -var UserSettingsModal = require('./user_settings/user_settings_modal.jsx'); +import AboutBuildModal from './about_build_modal.jsx'; +import InviteMemberModal from './invite_member_modal.jsx'; +import UserSettingsModal from './user_settings/user_settings_modal.jsx'; -var Constants = require('../utils/constants.jsx'); +import Constants from '../utils/constants.jsx'; function getStateFromStores() { const teams = []; diff --git a/web/react/components/new_channel_flow.jsx b/web/react/components/new_channel_flow.jsx index d6280d118..3a114aa19 100644 --- a/web/react/components/new_channel_flow.jsx +++ b/web/react/components/new_channel_flow.jsx @@ -1,13 +1,13 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Utils = require('../utils/utils.jsx'); -var AsyncClient = require('../utils/async_client.jsx'); -var Client = require('../utils/client.jsx'); -var UserStore = require('../stores/user_store.jsx'); +import * as Utils from '../utils/utils.jsx'; +import * as AsyncClient from '../utils/async_client.jsx'; +import * as Client from '../utils/client.jsx'; +import UserStore from '../stores/user_store.jsx'; -var NewChannelModal = require('./new_channel_modal.jsx'); -var ChangeURLModal = require('./change_url_modal.jsx'); +import NewChannelModal from './new_channel_modal.jsx'; +import ChangeURLModal from './change_url_modal.jsx'; const SHOW_NEW_CHANNEL = 1; const SHOW_EDIT_URL = 2; diff --git a/web/react/components/new_channel_modal.jsx b/web/react/components/new_channel_modal.jsx index 2c044cd5d..70fe10eef 100644 --- a/web/react/components/new_channel_modal.jsx +++ b/web/react/components/new_channel_modal.jsx @@ -1,7 +1,7 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const Utils = require('../utils/utils.jsx'); +import * as Utils from '../utils/utils.jsx'; var Modal = ReactBootstrap.Modal; export default class NewChannelModal extends React.Component { diff --git a/web/react/components/notify_counts.jsx b/web/react/components/notify_counts.jsx index 0a4f60989..19b81556b 100644 --- a/web/react/components/notify_counts.jsx +++ b/web/react/components/notify_counts.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var utils = require('../utils/utils.jsx'); -var ChannelStore = require('../stores/channel_store.jsx'); +import * as utils from '../utils/utils.jsx'; +import ChannelStore from '../stores/channel_store.jsx'; function getCountsStateFromStores() { var count = 0; diff --git a/web/react/components/password_reset.jsx b/web/react/components/password_reset.jsx index 54d126144..4c9bb6310 100644 --- a/web/react/components/password_reset.jsx +++ b/web/react/components/password_reset.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var PasswordResetSendLink = require('./password_reset_send_link.jsx'); -var PasswordResetForm = require('./password_reset_form.jsx'); +import PasswordResetSendLink from './password_reset_send_link.jsx'; +import PasswordResetForm from './password_reset_form.jsx'; export default class PasswordReset extends React.Component { constructor(props) { diff --git a/web/react/components/password_reset_form.jsx b/web/react/components/password_reset_form.jsx index b452c40b7..812911569 100644 --- a/web/react/components/password_reset_form.jsx +++ b/web/react/components/password_reset_form.jsx @@ -1,7 +1,7 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var client = require('../utils/client.jsx'); +import * as client from '../utils/client.jsx'; export default class PasswordResetForm extends React.Component { constructor(props) { diff --git a/web/react/components/password_reset_send_link.jsx b/web/react/components/password_reset_send_link.jsx index 8f1890705..051b8b02c 100644 --- a/web/react/components/password_reset_send_link.jsx +++ b/web/react/components/password_reset_send_link.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const Utils = require('../utils/utils.jsx'); -var client = require('../utils/client.jsx'); +import * as Utils from '../utils/utils.jsx'; +import * as client from '../utils/client.jsx'; export default class PasswordResetSendLink extends React.Component { constructor(props) { diff --git a/web/react/components/popover_list_members.jsx b/web/react/components/popover_list_members.jsx index 102bddcf5..b5000141a 100644 --- a/web/react/components/popover_list_members.jsx +++ b/web/react/components/popover_list_members.jsx @@ -1,12 +1,12 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var UserStore = require('../stores/user_store.jsx'); +import UserStore from '../stores/user_store.jsx'; var Popover = ReactBootstrap.Popover; var Overlay = ReactBootstrap.Overlay; -const Utils = require('../utils/utils.jsx'); +import * as Utils from '../utils/utils.jsx'; -const ChannelStore = require('../stores/channel_store.jsx'); +import ChannelStore from '../stores/channel_store.jsx'; export default class PopoverListMembers extends React.Component { constructor(props) { diff --git a/web/react/components/post.jsx b/web/react/components/post.jsx index 7e4af07c4..5b61c711c 100644 --- a/web/react/components/post.jsx +++ b/web/react/components/post.jsx @@ -1,17 +1,17 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var PostHeader = require('./post_header.jsx'); -var PostBody = require('./post_body.jsx'); -var AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); -var Constants = require('../utils/constants.jsx'); -var UserStore = require('../stores/user_store.jsx'); -var PostStore = require('../stores/post_store.jsx'); -var ChannelStore = require('../stores/channel_store.jsx'); -var client = require('../utils/client.jsx'); -var AsyncClient = require('../utils/async_client.jsx'); +import PostHeader from './post_header.jsx'; +import PostBody from './post_body.jsx'; +import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; +import Constants from '../utils/constants.jsx'; +import UserStore from '../stores/user_store.jsx'; +import PostStore from '../stores/post_store.jsx'; +import ChannelStore from '../stores/channel_store.jsx'; +import * as client from '../utils/client.jsx'; +import * as AsyncClient from '../utils/async_client.jsx'; var ActionTypes = Constants.ActionTypes; -var utils = require('../utils/utils.jsx'); +import * as utils from '../utils/utils.jsx'; export default class Post extends React.Component { constructor(props) { diff --git a/web/react/components/post_attachment.jsx b/web/react/components/post_attachment.jsx index cf65dfbfb..676bc91af 100644 --- a/web/react/components/post_attachment.jsx +++ b/web/react/components/post_attachment.jsx @@ -1,7 +1,7 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const TextFormatting = require('../utils/text_formatting.jsx'); +import * as TextFormatting from '../utils/text_formatting.jsx'; export default class PostAttachment extends React.Component { constructor(props) { diff --git a/web/react/components/post_attachment_list.jsx b/web/react/components/post_attachment_list.jsx index 03b866656..9c6700e2d 100644 --- a/web/react/components/post_attachment_list.jsx +++ b/web/react/components/post_attachment_list.jsx @@ -1,7 +1,7 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const PostAttachment = require('./post_attachment.jsx'); +import PostAttachment from './post_attachment.jsx'; export default class PostAttachmentList extends React.Component { constructor(props) { diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx index e1c057775..de8195f91 100644 --- a/web/react/components/post_body.jsx +++ b/web/react/components/post_body.jsx @@ -1,15 +1,15 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const FileAttachmentList = require('./file_attachment_list.jsx'); -const UserStore = require('../stores/user_store.jsx'); -const Utils = require('../utils/utils.jsx'); -const Constants = require('../utils/constants.jsx'); -const TextFormatting = require('../utils/text_formatting.jsx'); -const twemoji = require('twemoji'); -const PostBodyAdditionalContent = require('./post_body_additional_content.jsx'); - -const providers = require('./providers.json'); +import FileAttachmentList from './file_attachment_list.jsx'; +import UserStore from '../stores/user_store.jsx'; +import * as Utils from '../utils/utils.jsx'; +import Constants from '../utils/constants.jsx'; +import * as TextFormatting from '../utils/text_formatting.jsx'; +import twemoji from 'twemoji'; +import PostBodyAdditionalContent from './post_body_additional_content.jsx'; + +import providers from './providers.json'; export default class PostBody extends React.Component { constructor(props) { diff --git a/web/react/components/post_body_additional_content.jsx b/web/react/components/post_body_additional_content.jsx index 0c2c44286..e19bf51eb 100644 --- a/web/react/components/post_body_additional_content.jsx +++ b/web/react/components/post_body_additional_content.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const PostAttachmentList = require('./post_attachment_list.jsx'); -const PostAttachmentOEmbed = require('./post_attachment_oembed.jsx'); +import PostAttachmentList from './post_attachment_list.jsx'; +import PostAttachmentOEmbed from './post_attachment_oembed.jsx'; export default class PostBodyAdditionalContent extends React.Component { constructor(props) { diff --git a/web/react/components/post_deleted_modal.jsx b/web/react/components/post_deleted_modal.jsx index ba07a22f5..3723bcaba 100644 --- a/web/react/components/post_deleted_modal.jsx +++ b/web/react/components/post_deleted_modal.jsx @@ -1,9 +1,9 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var UserStore = require('../stores/user_store.jsx'); -var AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); -var Constants = require('../utils/constants.jsx'); +import UserStore from '../stores/user_store.jsx'; +import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; +import Constants from '../utils/constants.jsx'; var ActionTypes = Constants.ActionTypes; export default class PostDeletedModal extends React.Component { diff --git a/web/react/components/post_header.jsx b/web/react/components/post_header.jsx index e8b162fc2..ffc32f82c 100644 --- a/web/react/components/post_header.jsx +++ b/web/react/components/post_header.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var UserProfile = require('./user_profile.jsx'); -var PostInfo = require('./post_info.jsx'); +import UserProfile from './user_profile.jsx'; +import PostInfo from './post_info.jsx'; export default class PostHeader extends React.Component { constructor(props) { diff --git a/web/react/components/post_info.jsx b/web/react/components/post_info.jsx index 322834f07..5306edd3d 100644 --- a/web/react/components/post_info.jsx +++ b/web/react/components/post_info.jsx @@ -1,12 +1,12 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var DeletePostModal = require('./delete_post_modal.jsx'); -var UserStore = require('../stores/user_store.jsx'); -var utils = require('../utils/utils.jsx'); -var TimeSince = require('./time_since.jsx'); +import DeletePostModal from './delete_post_modal.jsx'; +import UserStore from '../stores/user_store.jsx'; +import * as utils from '../utils/utils.jsx'; +import TimeSince from './time_since.jsx'; -var Constants = require('../utils/constants.jsx'); +import Constants from '../utils/constants.jsx'; export default class PostInfo extends React.Component { constructor(props) { diff --git a/web/react/components/posts_view.jsx b/web/react/components/posts_view.jsx index ec8223203..5b36ecbc5 100644 --- a/web/react/components/posts_view.jsx +++ b/web/react/components/posts_view.jsx @@ -1,10 +1,10 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const UserStore = require('../stores/user_store.jsx'); -const Utils = require('../utils/utils.jsx'); -const Post = require('./post.jsx'); -const Constants = require('../utils/constants.jsx'); +import UserStore from '../stores/user_store.jsx'; +import * as Utils from '../utils/utils.jsx'; +import Post from './post.jsx'; +import Constants from '../utils/constants.jsx'; export default class PostsView extends React.Component { constructor(props) { diff --git a/web/react/components/posts_view_container.jsx b/web/react/components/posts_view_container.jsx index 2cb56cd47..c71ef401e 100644 --- a/web/react/components/posts_view_container.jsx +++ b/web/react/components/posts_view_container.jsx @@ -1,19 +1,19 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const PostsView = require('./posts_view.jsx'); -const LoadingScreen = require('./loading_screen.jsx'); -const ChannelInviteModal = require('./channel_invite_modal.jsx'); +import PostsView from './posts_view.jsx'; +import LoadingScreen from './loading_screen.jsx'; +import ChannelInviteModal from './channel_invite_modal.jsx'; -const ChannelStore = require('../stores/channel_store.jsx'); -const PostStore = require('../stores/post_store.jsx'); +import ChannelStore from '../stores/channel_store.jsx'; +import PostStore from '../stores/post_store.jsx'; -const Utils = require('../utils/utils.jsx'); -const Client = require('../utils/client.jsx'); -const AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); -const AsyncClient = require('../utils/async_client.jsx'); +import * as Utils from '../utils/utils.jsx'; +import * as Client from '../utils/client.jsx'; +import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; +import * as AsyncClient from '../utils/async_client.jsx'; -const Constants = require('../utils/constants.jsx'); +import Constants from '../utils/constants.jsx'; const ActionTypes = Constants.ActionTypes; import {createChannelIntroMessage} from '../utils/channel_intro_mssages.jsx'; diff --git a/web/react/components/register_app_modal.jsx b/web/react/components/register_app_modal.jsx index c40409dcc..100600c4b 100644 --- a/web/react/components/register_app_modal.jsx +++ b/web/react/components/register_app_modal.jsx @@ -1,7 +1,7 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../utils/client.jsx'); +import * as Client from '../utils/client.jsx'; export default class RegisterAppModal extends React.Component { constructor() { diff --git a/web/react/components/removed_from_channel_modal.jsx b/web/react/components/removed_from_channel_modal.jsx index 7cf0a2ef1..69d038c22 100644 --- a/web/react/components/removed_from_channel_modal.jsx +++ b/web/react/components/removed_from_channel_modal.jsx @@ -1,10 +1,10 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var ChannelStore = require('../stores/channel_store.jsx'); -var UserStore = require('../stores/user_store.jsx'); -var BrowserStore = require('../stores/browser_store.jsx'); -var utils = require('../utils/utils.jsx'); +import ChannelStore from '../stores/channel_store.jsx'; +import UserStore from '../stores/user_store.jsx'; +import BrowserStore from '../stores/browser_store.jsx'; +import * as utils from '../utils/utils.jsx'; export default class RemovedFromChannelModal extends React.Component { constructor(props) { diff --git a/web/react/components/rename_channel_modal.jsx b/web/react/components/rename_channel_modal.jsx index f47009cce..c16216c68 100644 --- a/web/react/components/rename_channel_modal.jsx +++ b/web/react/components/rename_channel_modal.jsx @@ -1,11 +1,11 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const Utils = require('../utils/utils.jsx'); -const Client = require('../utils/client.jsx'); -const AsyncClient = require('../utils/async_client.jsx'); -const ChannelStore = require('../stores/channel_store.jsx'); -const Constants = require('../utils/constants.jsx'); +import * as Utils from '../utils/utils.jsx'; +import * as Client from '../utils/client.jsx'; +import * as AsyncClient from '../utils/async_client.jsx'; +import ChannelStore from '../stores/channel_store.jsx'; +import Constants from '../utils/constants.jsx'; export default class RenameChannelModal extends React.Component { constructor(props) { diff --git a/web/react/components/rhs_comment.jsx b/web/react/components/rhs_comment.jsx index a55bf0039..3e555c85a 100644 --- a/web/react/components/rhs_comment.jsx +++ b/web/react/components/rhs_comment.jsx @@ -1,20 +1,20 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var PostStore = require('../stores/post_store.jsx'); -var ChannelStore = require('../stores/channel_store.jsx'); -var UserProfile = require('./user_profile.jsx'); -var UserStore = require('../stores/user_store.jsx'); -var AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); -var Utils = require('../utils/utils.jsx'); -var Constants = require('../utils/constants.jsx'); -var DeletePostModal = require('./delete_post_modal.jsx'); -var FileAttachmentList = require('./file_attachment_list.jsx'); -var Client = require('../utils/client.jsx'); -var AsyncClient = require('../utils/async_client.jsx'); +import PostStore from '../stores/post_store.jsx'; +import ChannelStore from '../stores/channel_store.jsx'; +import UserProfile from './user_profile.jsx'; +import UserStore from '../stores/user_store.jsx'; +import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; +import * as Utils from '../utils/utils.jsx'; +import Constants from '../utils/constants.jsx'; +import DeletePostModal from './delete_post_modal.jsx'; +import FileAttachmentList from './file_attachment_list.jsx'; +import * as Client from '../utils/client.jsx'; +import * as AsyncClient from '../utils/async_client.jsx'; var ActionTypes = Constants.ActionTypes; -var TextFormatting = require('../utils/text_formatting.jsx'); -var twemoji = require('twemoji'); +import * as TextFormatting from '../utils/text_formatting.jsx'; +import twemoji from 'twemoji'; export default class RhsComment extends React.Component { constructor(props) { diff --git a/web/react/components/rhs_header_post.jsx b/web/react/components/rhs_header_post.jsx index 856eea91d..990b33eb5 100644 --- a/web/react/components/rhs_header_post.jsx +++ b/web/react/components/rhs_header_post.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); -const Constants = require('../utils/constants.jsx'); +import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; +import Constants from '../utils/constants.jsx'; const ActionTypes = Constants.ActionTypes; export default class RhsHeaderPost extends React.Component { diff --git a/web/react/components/rhs_root_post.jsx b/web/react/components/rhs_root_post.jsx index 358bf8440..96f43bdb5 100644 --- a/web/react/components/rhs_root_post.jsx +++ b/web/react/components/rhs_root_post.jsx @@ -1,16 +1,16 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var ChannelStore = require('../stores/channel_store.jsx'); -var UserProfile = require('./user_profile.jsx'); -var UserStore = require('../stores/user_store.jsx'); -var TextFormatting = require('../utils/text_formatting.jsx'); -var utils = require('../utils/utils.jsx'); -var DeletePostModal = require('./delete_post_modal.jsx'); -var FileAttachmentList = require('./file_attachment_list.jsx'); -var twemoji = require('twemoji'); -var Constants = require('../utils/constants.jsx'); -const PostBodyAdditionalContent = require('./post_body_additional_content.jsx'); +import ChannelStore from '../stores/channel_store.jsx'; +import UserProfile from './user_profile.jsx'; +import UserStore from '../stores/user_store.jsx'; +import * as TextFormatting from '../utils/text_formatting.jsx'; +import * as utils from '../utils/utils.jsx'; +import DeletePostModal from './delete_post_modal.jsx'; +import FileAttachmentList from './file_attachment_list.jsx'; +import twemoji from 'twemoji'; +import Constants from '../utils/constants.jsx'; +import PostBodyAdditionalContent from './post_body_additional_content.jsx'; export default class RhsRootPost extends React.Component { constructor(props) { diff --git a/web/react/components/rhs_thread.jsx b/web/react/components/rhs_thread.jsx index cc062c538..4f453f76b 100644 --- a/web/react/components/rhs_thread.jsx +++ b/web/react/components/rhs_thread.jsx @@ -1,17 +1,17 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var PostStore = require('../stores/post_store.jsx'); -var UserStore = require('../stores/user_store.jsx'); -var PreferenceStore = require('../stores/preference_store.jsx'); -var Utils = require('../utils/utils.jsx'); -var SearchBox = require('./search_bar.jsx'); -var CreateComment = require('./create_comment.jsx'); -var RhsHeaderPost = require('./rhs_header_post.jsx'); -var RootPost = require('./rhs_root_post.jsx'); -var Comment = require('./rhs_comment.jsx'); -var Constants = require('../utils/constants.jsx'); -var FileUploadOverlay = require('./file_upload_overlay.jsx'); +import PostStore from '../stores/post_store.jsx'; +import UserStore from '../stores/user_store.jsx'; +import PreferenceStore from '../stores/preference_store.jsx'; +import * as Utils from '../utils/utils.jsx'; +import SearchBox from './search_bar.jsx'; +import CreateComment from './create_comment.jsx'; +import RhsHeaderPost from './rhs_header_post.jsx'; +import RootPost from './rhs_root_post.jsx'; +import Comment from './rhs_comment.jsx'; +import Constants from '../utils/constants.jsx'; +import FileUploadOverlay from './file_upload_overlay.jsx'; export default class RhsThread extends React.Component { constructor(props) { diff --git a/web/react/components/search_autocomplete.jsx b/web/react/components/search_autocomplete.jsx index 04384203f..4c0aa0166 100644 --- a/web/react/components/search_autocomplete.jsx +++ b/web/react/components/search_autocomplete.jsx @@ -1,12 +1,12 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const ChannelStore = require('../stores/channel_store.jsx'); -const KeyCodes = require('../utils/constants.jsx').KeyCodes; +import ChannelStore from '../stores/channel_store.jsx'; +import Constants from '../utils/constants.jsx'; +const KeyCodes = Constants.KeyCodes; const Popover = ReactBootstrap.Popover; -const UserStore = require('../stores/user_store.jsx'); -const Utils = require('../utils/utils.jsx'); -const Constants = require('../utils/constants.jsx'); +import UserStore from '../stores/user_store.jsx'; +import * as Utils from '../utils/utils.jsx'; const patterns = new Map([ ['channels', /\b(?:in|channel):\s*(\S*)$/i], diff --git a/web/react/components/search_bar.jsx b/web/react/components/search_bar.jsx index 0f749f2cf..32f0f93bf 100644 --- a/web/react/components/search_bar.jsx +++ b/web/react/components/search_bar.jsx @@ -1,15 +1,15 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var client = require('../utils/client.jsx'); -var AsyncClient = require('../utils/async_client.jsx'); -var SearchStore = require('../stores/search_store.jsx'); -var AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); -var utils = require('../utils/utils.jsx'); -var Constants = require('../utils/constants.jsx'); +import * as client from '../utils/client.jsx'; +import * as AsyncClient from '../utils/async_client.jsx'; +import SearchStore from '../stores/search_store.jsx'; +import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; +import * as utils from '../utils/utils.jsx'; +import Constants from '../utils/constants.jsx'; var ActionTypes = Constants.ActionTypes; var Popover = ReactBootstrap.Popover; -var SearchAutocomplete = require('./search_autocomplete.jsx'); +import SearchAutocomplete from './search_autocomplete.jsx'; export default class SearchBar extends React.Component { constructor() { diff --git a/web/react/components/search_results.jsx b/web/react/components/search_results.jsx index 491995087..141181701 100644 --- a/web/react/components/search_results.jsx +++ b/web/react/components/search_results.jsx @@ -1,12 +1,12 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var SearchStore = require('../stores/search_store.jsx'); -var UserStore = require('../stores/user_store.jsx'); -var SearchBox = require('./search_bar.jsx'); -var Utils = require('../utils/utils.jsx'); -var SearchResultsHeader = require('./search_results_header.jsx'); -var SearchResultsItem = require('./search_results_item.jsx'); +import SearchStore from '../stores/search_store.jsx'; +import UserStore from '../stores/user_store.jsx'; +import SearchBox from './search_bar.jsx'; +import * as Utils from '../utils/utils.jsx'; +import SearchResultsHeader from './search_results_header.jsx'; +import SearchResultsItem from './search_results_item.jsx'; function getStateFromStores() { return {results: SearchStore.getSearchResults()}; diff --git a/web/react/components/search_results_header.jsx b/web/react/components/search_results_header.jsx index fdd449c2d..581976494 100644 --- a/web/react/components/search_results_header.jsx +++ b/web/react/components/search_results_header.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); -var Constants = require('../utils/constants.jsx'); +import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; +import Constants from '../utils/constants.jsx'; var ActionTypes = Constants.ActionTypes; export default class SearchResultsHeader extends React.Component { diff --git a/web/react/components/search_results_item.jsx b/web/react/components/search_results_item.jsx index 52766a8a0..2202831a3 100644 --- a/web/react/components/search_results_item.jsx +++ b/web/react/components/search_results_item.jsx @@ -1,16 +1,16 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var SearchStore = require('../stores/search_store.jsx'); -var ChannelStore = require('../stores/channel_store.jsx'); -var UserStore = require('../stores/user_store.jsx'); -var UserProfile = require('./user_profile.jsx'); -var utils = require('../utils/utils.jsx'); -var client = require('../utils/client.jsx'); -var AsyncClient = require('../utils/async_client.jsx'); -var AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); -var Constants = require('../utils/constants.jsx'); -var TextFormatting = require('../utils/text_formatting.jsx'); +import SearchStore from '../stores/search_store.jsx'; +import ChannelStore from '../stores/channel_store.jsx'; +import UserStore from '../stores/user_store.jsx'; +import UserProfile from './user_profile.jsx'; +import * as utils from '../utils/utils.jsx'; +import * as client from '../utils/client.jsx'; +import * as AsyncClient from '../utils/async_client.jsx'; +import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; +import Constants from '../utils/constants.jsx'; +import * as TextFormatting from '../utils/text_formatting.jsx'; var ActionTypes = Constants.ActionTypes; export default class SearchResultsItem extends React.Component { diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx index 542f433f3..77d222436 100644 --- a/web/react/components/sidebar.jsx +++ b/web/react/components/sidebar.jsx @@ -1,23 +1,23 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const NewChannelFlow = require('./new_channel_flow.jsx'); -const MoreDirectChannels = require('./more_direct_channels.jsx'); -const SearchBox = require('./search_bar.jsx'); -const SidebarHeader = require('./sidebar_header.jsx'); -const UnreadChannelIndicator = require('./unread_channel_indicator.jsx'); -const TutorialTip = require('./tutorial/tutorial_tip.jsx'); - -const ChannelStore = require('../stores/channel_store.jsx'); -const UserStore = require('../stores/user_store.jsx'); -const TeamStore = require('../stores/team_store.jsx'); -const PreferenceStore = require('../stores/preference_store.jsx'); - -const AsyncClient = require('../utils/async_client.jsx'); -const Client = require('../utils/client.jsx'); -const Utils = require('../utils/utils.jsx'); - -const Constants = require('../utils/constants.jsx'); +import NewChannelFlow from './new_channel_flow.jsx'; +import MoreDirectChannels from './more_direct_channels.jsx'; +import SearchBox from './search_bar.jsx'; +import SidebarHeader from './sidebar_header.jsx'; +import UnreadChannelIndicator from './unread_channel_indicator.jsx'; +import TutorialTip from './tutorial/tutorial_tip.jsx'; + +import ChannelStore from '../stores/channel_store.jsx'; +import UserStore from '../stores/user_store.jsx'; +import TeamStore from '../stores/team_store.jsx'; +import PreferenceStore from '../stores/preference_store.jsx'; + +import * as AsyncClient from '../utils/async_client.jsx'; +import * as Client from '../utils/client.jsx'; +import * as Utils from '../utils/utils.jsx'; + +import Constants from '../utils/constants.jsx'; const Preferences = Constants.Preferences; const TutorialSteps = Constants.TutorialSteps; const NotificationPrefs = Constants.NotificationPrefs; diff --git a/web/react/components/sidebar_header.jsx b/web/react/components/sidebar_header.jsx index bc7f6ba50..20f4fd511 100644 --- a/web/react/components/sidebar_header.jsx +++ b/web/react/components/sidebar_header.jsx @@ -1,14 +1,14 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const NavbarDropdown = require('./navbar_dropdown.jsx'); -const TutorialTip = require('./tutorial/tutorial_tip.jsx'); +import NavbarDropdown from './navbar_dropdown.jsx'; +import TutorialTip from './tutorial/tutorial_tip.jsx'; -const UserStore = require('../stores/user_store.jsx'); -const PreferenceStore = require('../stores/preference_store.jsx'); +import UserStore from '../stores/user_store.jsx'; +import PreferenceStore from '../stores/preference_store.jsx'; -const Utils = require('../utils/utils.jsx'); -const Constants = require('../utils/constants.jsx'); +import * as Utils from '../utils/utils.jsx'; +import Constants from '../utils/constants.jsx'; const Preferences = Constants.Preferences; const TutorialSteps = Constants.TutorialSteps; diff --git a/web/react/components/sidebar_right.jsx b/web/react/components/sidebar_right.jsx index 8d16057fc..22d702369 100644 --- a/web/react/components/sidebar_right.jsx +++ b/web/react/components/sidebar_right.jsx @@ -1,11 +1,11 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var SearchResults = require('./search_results.jsx'); -var RhsThread = require('./rhs_thread.jsx'); -var SearchStore = require('../stores/search_store.jsx'); -var PostStore = require('../stores/post_store.jsx'); -var Utils = require('../utils/utils.jsx'); +import SearchResults from './search_results.jsx'; +import RhsThread from './rhs_thread.jsx'; +import SearchStore from '../stores/search_store.jsx'; +import PostStore from '../stores/post_store.jsx'; +import * as Utils from '../utils/utils.jsx'; export default class SidebarRight extends React.Component { constructor(props) { diff --git a/web/react/components/sidebar_right_menu.jsx b/web/react/components/sidebar_right_menu.jsx index 6a428e884..f6c0c8adb 100644 --- a/web/react/components/sidebar_right_menu.jsx +++ b/web/react/components/sidebar_right_menu.jsx @@ -1,12 +1,12 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var InviteMemberModal = require('./invite_member_modal.jsx'); -var UserSettingsModal = require('./user_settings/user_settings_modal.jsx'); -var UserStore = require('../stores/user_store.jsx'); -var TeamStore = require('../stores/team_store.jsx'); -var client = require('../utils/client.jsx'); -var utils = require('../utils/utils.jsx'); +import InviteMemberModal from './invite_member_modal.jsx'; +import UserSettingsModal from './user_settings/user_settings_modal.jsx'; +import UserStore from '../stores/user_store.jsx'; +import TeamStore from '../stores/team_store.jsx'; +import * as client from '../utils/client.jsx'; +import * as utils from '../utils/utils.jsx'; export default class SidebarRightMenu extends React.Component { componentDidMount() { diff --git a/web/react/components/signup_team.jsx b/web/react/components/signup_team.jsx index 516765a3f..0ac837326 100644 --- a/web/react/components/signup_team.jsx +++ b/web/react/components/signup_team.jsx @@ -1,10 +1,10 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const ChoosePage = require('./team_signup_choose_auth.jsx'); -const EmailSignUpPage = require('./team_signup_with_email.jsx'); -const SSOSignupPage = require('./team_signup_with_sso.jsx'); -const Constants = require('../utils/constants.jsx'); +import ChoosePage from './team_signup_choose_auth.jsx'; +import EmailSignUpPage from './team_signup_with_email.jsx'; +import SSOSignupPage from './team_signup_with_sso.jsx'; +import Constants from '../utils/constants.jsx'; export default class TeamSignUp extends React.Component { constructor(props) { diff --git a/web/react/components/signup_team_complete.jsx b/web/react/components/signup_team_complete.jsx index c30132885..6c7fd57b3 100644 --- a/web/react/components/signup_team_complete.jsx +++ b/web/react/components/signup_team_complete.jsx @@ -1,13 +1,13 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var WelcomePage = require('./team_signup_welcome_page.jsx'); -var TeamDisplayNamePage = require('./team_signup_display_name_page.jsx'); -var TeamURLPage = require('./team_signup_url_page.jsx'); -var SendInivtesPage = require('./team_signup_send_invites_page.jsx'); -var UsernamePage = require('./team_signup_username_page.jsx'); -var PasswordPage = require('./team_signup_password_page.jsx'); -var BrowserStore = require('../stores/browser_store.jsx'); +import WelcomePage from './team_signup_welcome_page.jsx'; +import TeamDisplayNamePage from './team_signup_display_name_page.jsx'; +import TeamURLPage from './team_signup_url_page.jsx'; +import SendInivtesPage from './team_signup_send_invites_page.jsx'; +import UsernamePage from './team_signup_username_page.jsx'; +import PasswordPage from './team_signup_password_page.jsx'; +import BrowserStore from '../stores/browser_store.jsx'; export default class SignupTeamComplete extends React.Component { constructor(props) { diff --git a/web/react/components/signup_user_complete.jsx b/web/react/components/signup_user_complete.jsx index d70ea5065..2bde78726 100644 --- a/web/react/components/signup_user_complete.jsx +++ b/web/react/components/signup_user_complete.jsx @@ -1,10 +1,10 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Utils = require('../utils/utils.jsx'); -var client = require('../utils/client.jsx'); -var UserStore = require('../stores/user_store.jsx'); -var BrowserStore = require('../stores/browser_store.jsx'); +import * as Utils from '../utils/utils.jsx'; +import * as client from '../utils/client.jsx'; +import UserStore from '../stores/user_store.jsx'; +import BrowserStore from '../stores/browser_store.jsx'; export default class SignupUserComplete extends React.Component { constructor(props) { diff --git a/web/react/components/team_export_tab.jsx b/web/react/components/team_export_tab.jsx index e15e3a372..14df7fffc 100644 --- a/web/react/components/team_export_tab.jsx +++ b/web/react/components/team_export_tab.jsx @@ -1,7 +1,7 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../utils/client.jsx'); +import * as Client from '../utils/client.jsx'; export default class TeamExportTab extends React.Component { constructor(props) { diff --git a/web/react/components/team_general_tab.jsx b/web/react/components/team_general_tab.jsx index a50859489..795fad671 100644 --- a/web/react/components/team_general_tab.jsx +++ b/web/react/components/team_general_tab.jsx @@ -1,12 +1,12 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const SettingItemMin = require('./setting_item_min.jsx'); -const SettingItemMax = require('./setting_item_max.jsx'); +import SettingItemMin from './setting_item_min.jsx'; +import SettingItemMax from './setting_item_max.jsx'; -const Client = require('../utils/client.jsx'); -const Utils = require('../utils/utils.jsx'); -const TeamStore = require('../stores/team_store.jsx'); +import * as Client from '../utils/client.jsx'; +import * as Utils from '../utils/utils.jsx'; +import TeamStore from '../stores/team_store.jsx'; export default class GeneralTab extends React.Component { constructor(props) { diff --git a/web/react/components/team_import_tab.jsx b/web/react/components/team_import_tab.jsx index a80b1a472..37f8746d7 100644 --- a/web/react/components/team_import_tab.jsx +++ b/web/react/components/team_import_tab.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var utils = require('../utils/utils.jsx'); -var SettingUpload = require('./setting_upload.jsx'); +import * as utils from '../utils/utils.jsx'; +import SettingUpload from './setting_upload.jsx'; export default class TeamImportTab extends React.Component { constructor(props) { diff --git a/web/react/components/team_members.jsx b/web/react/components/team_members.jsx index afe7f46ec..cd0766012 100644 --- a/web/react/components/team_members.jsx +++ b/web/react/components/team_members.jsx @@ -1,9 +1,9 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var UserStore = require('../stores/user_store.jsx'); -var MemberListTeam = require('./member_list_team.jsx'); -var utils = require('../utils/utils.jsx'); +import UserStore from '../stores/user_store.jsx'; +import MemberListTeam from './member_list_team.jsx'; +import * as utils from '../utils/utils.jsx'; function getStateFromStores() { var users = UserStore.getProfiles(); diff --git a/web/react/components/team_settings.jsx b/web/react/components/team_settings.jsx index 862f3c528..bbcedb5dd 100644 --- a/web/react/components/team_settings.jsx +++ b/web/react/components/team_settings.jsx @@ -1,11 +1,11 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var TeamStore = require('../stores/team_store.jsx'); -var ImportTab = require('./team_import_tab.jsx'); -var ExportTab = require('./team_export_tab.jsx'); -var GeneralTab = require('./team_general_tab.jsx'); -var Utils = require('../utils/utils.jsx'); +import TeamStore from '../stores/team_store.jsx'; +import ImportTab from './team_import_tab.jsx'; +import ExportTab from './team_export_tab.jsx'; +import GeneralTab from './team_general_tab.jsx'; +import * as Utils from '../utils/utils.jsx'; export default class TeamSettings extends React.Component { constructor(props) { diff --git a/web/react/components/team_settings_modal.jsx b/web/react/components/team_settings_modal.jsx index 4d47db2a8..dbdbde958 100644 --- a/web/react/components/team_settings_modal.jsx +++ b/web/react/components/team_settings_modal.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const SettingsSidebar = require('./settings_sidebar.jsx'); -const TeamSettings = require('./team_settings.jsx'); +import SettingsSidebar from './settings_sidebar.jsx'; +import TeamSettings from './team_settings.jsx'; export default class TeamSettingsModal extends React.Component { constructor(props) { diff --git a/web/react/components/team_signup_display_name_page.jsx b/web/react/components/team_signup_display_name_page.jsx index 2005ecc31..f4d5ea162 100644 --- a/web/react/components/team_signup_display_name_page.jsx +++ b/web/react/components/team_signup_display_name_page.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var utils = require('../utils/utils.jsx'); -var client = require('../utils/client.jsx'); +import * as utils from '../utils/utils.jsx'; +import * as client from '../utils/client.jsx'; export default class TeamSignupDisplayNamePage extends React.Component { constructor(props) { diff --git a/web/react/components/team_signup_email_item.jsx b/web/react/components/team_signup_email_item.jsx index 1d2b24ed7..59c4771d7 100644 --- a/web/react/components/team_signup_email_item.jsx +++ b/web/react/components/team_signup_email_item.jsx @@ -1,7 +1,7 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const Utils = require('../utils/utils.jsx'); +import * as Utils from '../utils/utils.jsx'; export default class TeamSignupEmailItem extends React.Component { constructor(props) { diff --git a/web/react/components/team_signup_password_page.jsx b/web/react/components/team_signup_password_page.jsx index 67fd686bc..378c7fe2c 100644 --- a/web/react/components/team_signup_password_page.jsx +++ b/web/react/components/team_signup_password_page.jsx @@ -1,9 +1,9 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../utils/client.jsx'); -var BrowserStore = require('../stores/browser_store.jsx'); -var UserStore = require('../stores/user_store.jsx'); +import * as Client from '../utils/client.jsx'; +import BrowserStore from '../stores/browser_store.jsx'; +import UserStore from '../stores/user_store.jsx'; export default class TeamSignupPasswordPage extends React.Component { constructor(props) { diff --git a/web/react/components/team_signup_send_invites_page.jsx b/web/react/components/team_signup_send_invites_page.jsx index 7b4db8fae..a580623e4 100644 --- a/web/react/components/team_signup_send_invites_page.jsx +++ b/web/react/components/team_signup_send_invites_page.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var EmailItem = require('./team_signup_email_item.jsx'); -var Client = require('../utils/client.jsx'); +import EmailItem from './team_signup_email_item.jsx'; +import * as Client from '../utils/client.jsx'; export default class TeamSignupSendInvitesPage extends React.Component { constructor(props) { diff --git a/web/react/components/team_signup_url_page.jsx b/web/react/components/team_signup_url_page.jsx index 8972fda1a..30459fc67 100644 --- a/web/react/components/team_signup_url_page.jsx +++ b/web/react/components/team_signup_url_page.jsx @@ -1,9 +1,9 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const Utils = require('../utils/utils.jsx'); -const Client = require('../utils/client.jsx'); -const Constants = require('../utils/constants.jsx'); +import * as Utils from '../utils/utils.jsx'; +import * as Client from '../utils/client.jsx'; +import Constants from '../utils/constants.jsx'; export default class TeamSignupUrlPage extends React.Component { constructor(props) { diff --git a/web/react/components/team_signup_username_page.jsx b/web/react/components/team_signup_username_page.jsx index d8d0dbf2c..de239f169 100644 --- a/web/react/components/team_signup_username_page.jsx +++ b/web/react/components/team_signup_username_page.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Utils = require('../utils/utils.jsx'); -var Client = require('../utils/client.jsx'); +import * as Utils from '../utils/utils.jsx'; +import * as Client from '../utils/client.jsx'; export default class TeamSignupUsernamePage extends React.Component { constructor(props) { diff --git a/web/react/components/team_signup_welcome_page.jsx b/web/react/components/team_signup_welcome_page.jsx index 9448413ce..aa91a1329 100644 --- a/web/react/components/team_signup_welcome_page.jsx +++ b/web/react/components/team_signup_welcome_page.jsx @@ -1,9 +1,9 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Utils = require('../utils/utils.jsx'); -var Client = require('../utils/client.jsx'); -var BrowserStore = require('../stores/browser_store.jsx'); +import * as Utils from '../utils/utils.jsx'; +import * as Client from '../utils/client.jsx'; +import BrowserStore from '../stores/browser_store.jsx'; export default class TeamSignupWelcomePage extends React.Component { constructor(props) { diff --git a/web/react/components/team_signup_with_email.jsx b/web/react/components/team_signup_with_email.jsx index 021713f04..06d6e3934 100644 --- a/web/react/components/team_signup_with_email.jsx +++ b/web/react/components/team_signup_with_email.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const Utils = require('../utils/utils.jsx'); -const Client = require('../utils/client.jsx'); +import * as Utils from '../utils/utils.jsx'; +import * as Client from '../utils/client.jsx'; export default class EmailSignUpPage extends React.Component { constructor() { diff --git a/web/react/components/team_signup_with_sso.jsx b/web/react/components/team_signup_with_sso.jsx index a0ccdf2c7..e3f16efb0 100644 --- a/web/react/components/team_signup_with_sso.jsx +++ b/web/react/components/team_signup_with_sso.jsx @@ -1,9 +1,9 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var utils = require('../utils/utils.jsx'); -var client = require('../utils/client.jsx'); -var Constants = require('../utils/constants.jsx'); +import * as utils from '../utils/utils.jsx'; +import * as client from '../utils/client.jsx'; +import Constants from '../utils/constants.jsx'; export default class SSOSignUpPage extends React.Component { constructor(props) { diff --git a/web/react/components/textbox.jsx b/web/react/components/textbox.jsx index 1a5269baa..e2868e946 100644 --- a/web/react/components/textbox.jsx +++ b/web/react/components/textbox.jsx @@ -1,14 +1,14 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const AppDispatcher = require('../dispatcher/app_dispatcher.jsx'); -const SearchStore = require('../stores/search_store.jsx'); -const CommandList = require('./command_list.jsx'); -const ErrorStore = require('../stores/error_store.jsx'); - -const TextFormatting = require('../utils/text_formatting.jsx'); -const Utils = require('../utils/utils.jsx'); -const Constants = require('../utils/constants.jsx'); +import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; +import SearchStore from '../stores/search_store.jsx'; +import CommandList from './command_list.jsx'; +import ErrorStore from '../stores/error_store.jsx'; + +import * as TextFormatting from '../utils/text_formatting.jsx'; +import * as Utils from '../utils/utils.jsx'; +import Constants from '../utils/constants.jsx'; const ActionTypes = Constants.ActionTypes; const KeyCodes = Constants.KeyCodes; diff --git a/web/react/components/time_since.jsx b/web/react/components/time_since.jsx index 212beb080..cffff6ee7 100644 --- a/web/react/components/time_since.jsx +++ b/web/react/components/time_since.jsx @@ -1,7 +1,7 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Utils = require('../utils/utils.jsx'); +import * as Utils from '../utils/utils.jsx'; var Tooltip = ReactBootstrap.Tooltip; var OverlayTrigger = ReactBootstrap.OverlayTrigger; diff --git a/web/react/components/tutorial/tutorial_intro_screens.jsx b/web/react/components/tutorial/tutorial_intro_screens.jsx index 3afc5145d..9360d31f8 100644 --- a/web/react/components/tutorial/tutorial_intro_screens.jsx +++ b/web/react/components/tutorial/tutorial_intro_screens.jsx @@ -1,14 +1,14 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const UserStore = require('../../stores/user_store.jsx'); -const ChannelStore = require('../../stores/channel_store.jsx'); -const TeamStore = require('../../stores/team_store.jsx'); -const PreferenceStore = require('../../stores/preference_store.jsx'); -const Utils = require('../../utils/utils.jsx'); -const AsyncClient = require('../../utils/async_client.jsx'); - -const Constants = require('../../utils/constants.jsx'); +import UserStore from '../../stores/user_store.jsx'; +import ChannelStore from '../../stores/channel_store.jsx'; +import TeamStore from '../../stores/team_store.jsx'; +import PreferenceStore from '../../stores/preference_store.jsx'; +import * as Utils from '../../utils/utils.jsx'; +import * as AsyncClient from '../../utils/async_client.jsx'; + +import Constants from '../../utils/constants.jsx'; const Preferences = Constants.Preferences; const NUM_SCREENS = 3; diff --git a/web/react/components/tutorial/tutorial_tip.jsx b/web/react/components/tutorial/tutorial_tip.jsx index dd231b816..d7c67cc9c 100644 --- a/web/react/components/tutorial/tutorial_tip.jsx +++ b/web/react/components/tutorial/tutorial_tip.jsx @@ -1,11 +1,11 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const UserStore = require('../../stores/user_store.jsx'); -const PreferenceStore = require('../../stores/preference_store.jsx'); -const AsyncClient = require('../../utils/async_client.jsx'); +import UserStore from '../../stores/user_store.jsx'; +import PreferenceStore from '../../stores/preference_store.jsx'; +import * as AsyncClient from '../../utils/async_client.jsx'; -const Constants = require('../../utils/constants.jsx'); +import Constants from '../../utils/constants.jsx'; const Preferences = Constants.Preferences; const Overlay = ReactBootstrap.Overlay; diff --git a/web/react/components/user_profile.jsx b/web/react/components/user_profile.jsx index a2523ef68..438c0bc82 100644 --- a/web/react/components/user_profile.jsx +++ b/web/react/components/user_profile.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Utils = require('../utils/utils.jsx'); -var UserStore = require('../stores/user_store.jsx'); +import * as Utils from '../utils/utils.jsx'; +import UserStore from '../stores/user_store.jsx'; var Popover = ReactBootstrap.Popover; var OverlayTrigger = ReactBootstrap.OverlayTrigger; diff --git a/web/react/components/user_settings/custom_theme_chooser.jsx b/web/react/components/user_settings/custom_theme_chooser.jsx index 3d0a2b548..35f836adb 100644 --- a/web/react/components/user_settings/custom_theme_chooser.jsx +++ b/web/react/components/user_settings/custom_theme_chooser.jsx @@ -1,7 +1,7 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Constants = require('../../utils/constants.jsx'); +import Constants from '../../utils/constants.jsx'; export default class CustomThemeChooser extends React.Component { constructor(props) { diff --git a/web/react/components/user_settings/import_theme_modal.jsx b/web/react/components/user_settings/import_theme_modal.jsx index 4d594bb1b..3df9dfedf 100644 --- a/web/react/components/user_settings/import_theme_modal.jsx +++ b/web/react/components/user_settings/import_theme_modal.jsx @@ -1,14 +1,14 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const ModalStore = require('../../stores/modal_store.jsx'); -const UserStore = require('../../stores/user_store.jsx'); -const Utils = require('../../utils/utils.jsx'); -const Client = require('../../utils/client.jsx'); +import ModalStore from '../../stores/modal_store.jsx'; +import UserStore from '../../stores/user_store.jsx'; +import * as Utils from '../../utils/utils.jsx'; +import * as Client from '../../utils/client.jsx'; const Modal = ReactBootstrap.Modal; -const AppDispatcher = require('../../dispatcher/app_dispatcher.jsx'); -const Constants = require('../../utils/constants.jsx'); +import AppDispatcher from '../../dispatcher/app_dispatcher.jsx'; +import Constants from '../../utils/constants.jsx'; const ActionTypes = Constants.ActionTypes; export default class ImportThemeModal extends React.Component { diff --git a/web/react/components/user_settings/manage_incoming_hooks.jsx b/web/react/components/user_settings/manage_incoming_hooks.jsx index 128c011ea..9ebb55646 100644 --- a/web/react/components/user_settings/manage_incoming_hooks.jsx +++ b/web/react/components/user_settings/manage_incoming_hooks.jsx @@ -1,11 +1,11 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Client = require('../../utils/client.jsx'); -var Utils = require('../../utils/utils.jsx'); -var Constants = require('../../utils/constants.jsx'); -var ChannelStore = require('../../stores/channel_store.jsx'); -var LoadingScreen = require('../loading_screen.jsx'); +import * as Client from '../../utils/client.jsx'; +import * as Utils from '../../utils/utils.jsx'; +import Constants from '../../utils/constants.jsx'; +import ChannelStore from '../../stores/channel_store.jsx'; +import LoadingScreen from '../loading_screen.jsx'; export default class ManageIncomingHooks extends React.Component { constructor() { diff --git a/web/react/components/user_settings/manage_outgoing_hooks.jsx b/web/react/components/user_settings/manage_outgoing_hooks.jsx index 7b7cf7401..9c88bb819 100644 --- a/web/react/components/user_settings/manage_outgoing_hooks.jsx +++ b/web/react/components/user_settings/manage_outgoing_hooks.jsx @@ -1,12 +1,12 @@ // Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved. // See License.txt for license information. -const LoadingScreen = require('../loading_screen.jsx'); +import LoadingScreen from '../loading_screen.jsx'; -const ChannelStore = require('../../stores/channel_store.jsx'); +import ChannelStore from '../../stores/channel_store.jsx'; -const Client = require('../../utils/client.jsx'); -const Constants = require('../../utils/constants.jsx'); +import * as Client from '../../utils/client.jsx'; +import Constants from '../../utils/constants.jsx'; export default class ManageOutgoingHooks extends React.Component { constructor() { diff --git a/web/react/components/user_settings/premade_theme_chooser.jsx b/web/react/components/user_settings/premade_theme_chooser.jsx index 22cfcebcd..9889bff5c 100644 --- a/web/react/components/user_settings/premade_theme_chooser.jsx +++ b/web/react/components/user_settings/premade_theme_chooser.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var Utils = require('../../utils/utils.jsx'); -var Constants = require('../../utils/constants.jsx'); +import * as Utils from '../../utils/utils.jsx'; +import Constants from '../../utils/constants.jsx'; export default class PremadeThemeChooser extends React.Component { constructor(props) { diff --git a/web/react/components/user_settings/user_settings.jsx b/web/react/components/user_settings/user_settings.jsx index 40825ba93..54d98bbde 100644 --- a/web/react/components/user_settings/user_settings.jsx +++ b/web/react/components/user_settings/user_settings.jsx @@ -1,16 +1,16 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var UserStore = require('../../stores/user_store.jsx'); -var utils = require('../../utils/utils.jsx'); -var NotificationsTab = require('./user_settings_notifications.jsx'); -var SecurityTab = require('./user_settings_security.jsx'); -var GeneralTab = require('./user_settings_general.jsx'); -var AppearanceTab = require('./user_settings_appearance.jsx'); -var DeveloperTab = require('./user_settings_developer.jsx'); -var IntegrationsTab = require('./user_settings_integrations.jsx'); -var DisplayTab = require('./user_settings_display.jsx'); -var AdvancedTab = require('./user_settings_advanced.jsx'); +import UserStore from '../../stores/user_store.jsx'; +import * as utils from '../../utils/utils.jsx'; +import NotificationsTab from './user_settings_notifications.jsx'; +import SecurityTab from './user_settings_security.jsx'; +import GeneralTab from './user_settings_general.jsx'; +import AppearanceTab from './user_settings_appearance.jsx'; +import DeveloperTab from './user_settings_developer.jsx'; +import IntegrationsTab from './user_settings_integrations.jsx'; +import DisplayTab from './user_settings_display.jsx'; +import AdvancedTab from './user_settings_advanced.jsx'; export default class UserSettings extends React.Component { constructor(props) { diff --git a/web/react/components/user_settings/user_settings_advanced.jsx b/web/react/components/user_settings/user_settings_advanced.jsx index 2616981ba..ac82595f5 100644 --- a/web/react/components/user_settings/user_settings_advanced.jsx +++ b/web/react/components/user_settings/user_settings_advanced.jsx @@ -1,11 +1,11 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const Client = require('../../utils/client.jsx'); -const SettingItemMin = require('../setting_item_min.jsx'); -const SettingItemMax = require('../setting_item_max.jsx'); -const Constants = require('../../utils/constants.jsx'); -const PreferenceStore = require('../../stores/preference_store.jsx'); +import * as Client from '../../utils/client.jsx'; +import SettingItemMin from '../setting_item_min.jsx'; +import SettingItemMax from '../setting_item_max.jsx'; +import Constants from '../../utils/constants.jsx'; +import PreferenceStore from '../../stores/preference_store.jsx'; export default class AdvancedSettingsDisplay extends React.Component { constructor(props) { diff --git a/web/react/components/user_settings/user_settings_appearance.jsx b/web/react/components/user_settings/user_settings_appearance.jsx index 029a1af5e..ad41ab771 100644 --- a/web/react/components/user_settings/user_settings_appearance.jsx +++ b/web/react/components/user_settings/user_settings_appearance.jsx @@ -1,16 +1,16 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const CustomThemeChooser = require('./custom_theme_chooser.jsx'); -const PremadeThemeChooser = require('./premade_theme_chooser.jsx'); +import CustomThemeChooser from './custom_theme_chooser.jsx'; +import PremadeThemeChooser from './premade_theme_chooser.jsx'; -const UserStore = require('../../stores/user_store.jsx'); +import UserStore from '../../stores/user_store.jsx'; -const AppDispatcher = require('../../dispatcher/app_dispatcher.jsx'); -const Client = require('../../utils/client.jsx'); -const Utils = require('../../utils/utils.jsx'); +import AppDispatcher from '../../dispatcher/app_dispatcher.jsx'; +import * as Client from '../../utils/client.jsx'; +import * as Utils from '../../utils/utils.jsx'; -const Constants = require('../../utils/constants.jsx'); +import Constants from '../../utils/constants.jsx'; const ActionTypes = Constants.ActionTypes; export default class UserSettingsAppearance extends React.Component { diff --git a/web/react/components/user_settings/user_settings_developer.jsx b/web/react/components/user_settings/user_settings_developer.jsx index e6adba1d4..2d02c255a 100644 --- a/web/react/components/user_settings/user_settings_developer.jsx +++ b/web/react/components/user_settings/user_settings_developer.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var SettingItemMin = require('../setting_item_min.jsx'); -var SettingItemMax = require('../setting_item_max.jsx'); +import SettingItemMin from '../setting_item_min.jsx'; +import SettingItemMax from '../setting_item_max.jsx'; export default class DeveloperTab extends React.Component { constructor(props) { diff --git a/web/react/components/user_settings/user_settings_general.jsx b/web/react/components/user_settings/user_settings_general.jsx index b363f0673..b3ec7ddd7 100644 --- a/web/react/components/user_settings/user_settings_general.jsx +++ b/web/react/components/user_settings/user_settings_general.jsx @@ -1,16 +1,16 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const SettingItemMin = require('../setting_item_min.jsx'); -const SettingItemMax = require('../setting_item_max.jsx'); -const SettingPicture = require('../setting_picture.jsx'); +import SettingItemMin from '../setting_item_min.jsx'; +import SettingItemMax from '../setting_item_max.jsx'; +import SettingPicture from '../setting_picture.jsx'; -const UserStore = require('../../stores/user_store.jsx'); -const ErrorStore = require('../../stores/error_store.jsx'); +import UserStore from '../../stores/user_store.jsx'; +import ErrorStore from '../../stores/error_store.jsx'; -const Client = require('../../utils/client.jsx'); -const AsyncClient = require('../../utils/async_client.jsx'); -const Utils = require('../../utils/utils.jsx'); +import * as Client from '../../utils/client.jsx'; +import * as AsyncClient from '../../utils/async_client.jsx'; +import * as Utils from '../../utils/utils.jsx'; export default class UserSettingsGeneralTab extends React.Component { constructor(props) { diff --git a/web/react/components/user_settings/user_settings_integrations.jsx b/web/react/components/user_settings/user_settings_integrations.jsx index 744a6beea..a86510eb3 100644 --- a/web/react/components/user_settings/user_settings_integrations.jsx +++ b/web/react/components/user_settings/user_settings_integrations.jsx @@ -1,10 +1,10 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var SettingItemMin = require('../setting_item_min.jsx'); -var SettingItemMax = require('../setting_item_max.jsx'); -var ManageIncomingHooks = require('./manage_incoming_hooks.jsx'); -var ManageOutgoingHooks = require('./manage_outgoing_hooks.jsx'); +import SettingItemMin from '../setting_item_min.jsx'; +import SettingItemMax from '../setting_item_max.jsx'; +import ManageIncomingHooks from './manage_incoming_hooks.jsx'; +import ManageOutgoingHooks from './manage_outgoing_hooks.jsx'; export default class UserSettingsIntegrationsTab extends React.Component { constructor(props) { diff --git a/web/react/components/user_settings/user_settings_modal.jsx b/web/react/components/user_settings/user_settings_modal.jsx index 776201295..f9d03f56d 100644 --- a/web/react/components/user_settings/user_settings_modal.jsx +++ b/web/react/components/user_settings/user_settings_modal.jsx @@ -1,10 +1,10 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const ConfirmModal = require('../confirm_modal.jsx'); +import ConfirmModal from '../confirm_modal.jsx'; const Modal = ReactBootstrap.Modal; -const SettingsSidebar = require('../settings_sidebar.jsx'); -const UserSettings = require('./user_settings.jsx'); +import SettingsSidebar from '../settings_sidebar.jsx'; +import UserSettings from './user_settings.jsx'; export default class UserSettingsModal extends React.Component { constructor(props) { diff --git a/web/react/components/user_settings/user_settings_notifications.jsx b/web/react/components/user_settings/user_settings_notifications.jsx index c958bf5bc..e36aed395 100644 --- a/web/react/components/user_settings/user_settings_notifications.jsx +++ b/web/react/components/user_settings/user_settings_notifications.jsx @@ -1,14 +1,14 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const SettingItemMin = require('../setting_item_min.jsx'); -const SettingItemMax = require('../setting_item_max.jsx'); +import SettingItemMin from '../setting_item_min.jsx'; +import SettingItemMax from '../setting_item_max.jsx'; -const UserStore = require('../../stores/user_store.jsx'); +import UserStore from '../../stores/user_store.jsx'; -const Client = require('../../utils/client.jsx'); -const AsyncClient = require('../../utils/async_client.jsx'); -const Utils = require('../../utils/utils.jsx'); +import * as Client from '../../utils/client.jsx'; +import * as AsyncClient from '../../utils/async_client.jsx'; +import * as Utils from '../../utils/utils.jsx'; function getNotificationsStateFromStores() { var user = UserStore.getCurrentUser(); diff --git a/web/react/components/user_settings/user_settings_security.jsx b/web/react/components/user_settings/user_settings_security.jsx index 16ace0abc..fa2fecf07 100644 --- a/web/react/components/user_settings/user_settings_security.jsx +++ b/web/react/components/user_settings/user_settings_security.jsx @@ -1,14 +1,14 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var SettingItemMin = require('../setting_item_min.jsx'); -var SettingItemMax = require('../setting_item_max.jsx'); -var AccessHistoryModal = require('../access_history_modal.jsx'); -var ActivityLogModal = require('../activity_log_modal.jsx'); -var ToggleModalButton = require('../toggle_modal_button.jsx'); -var Client = require('../../utils/client.jsx'); -var AsyncClient = require('../../utils/async_client.jsx'); -var Constants = require('../../utils/constants.jsx'); +import SettingItemMin from '../setting_item_min.jsx'; +import SettingItemMax from '../setting_item_max.jsx'; +import AccessHistoryModal from '../access_history_modal.jsx'; +import ActivityLogModal from '../activity_log_modal.jsx'; +import ToggleModalButton from '../toggle_modal_button.jsx'; +import * as Client from '../../utils/client.jsx'; +import * as AsyncClient from '../../utils/async_client.jsx'; +import Constants from '../../utils/constants.jsx'; export default class SecurityTab extends React.Component { constructor(props) { diff --git a/web/react/components/view_image.jsx b/web/react/components/view_image.jsx index 92d7cd835..91f4b3bdc 100644 --- a/web/react/components/view_image.jsx +++ b/web/react/components/view_image.jsx @@ -1,10 +1,10 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -const Client = require('../utils/client.jsx'); -const Utils = require('../utils/utils.jsx'); -const Constants = require('../utils/constants.jsx'); -const ViewImagePopoverBar = require('./view_image_popover_bar.jsx'); +import * as Client from '../utils/client.jsx'; +import * as Utils from '../utils/utils.jsx'; +import Constants from '../utils/constants.jsx'; +import ViewImagePopoverBar from './view_image_popover_bar.jsx'; const Modal = ReactBootstrap.Modal; const KeyCodes = Constants.KeyCodes; |