diff options
Diffstat (limited to 'webapp/components')
-rw-r--r-- | webapp/components/admin_console/cluster_settings.jsx | 4 | ||||
-rw-r--r-- | webapp/components/admin_console/cluster_table.jsx | 2 | ||||
-rw-r--r-- | webapp/components/admin_console/cluster_table_container.jsx | 6 | ||||
-rw-r--r-- | webapp/components/admin_console/file_upload_setting.jsx | 2 | ||||
-rw-r--r-- | webapp/components/channel_header.jsx | 8 | ||||
-rw-r--r-- | webapp/components/login/login_controller.jsx | 1 | ||||
-rw-r--r-- | webapp/components/navbar.jsx | 8 | ||||
-rw-r--r-- | webapp/components/suggestion/at_mention_provider.jsx | 2 | ||||
-rw-r--r-- | webapp/components/user_settings/user_settings_modal.jsx | 2 | ||||
-rw-r--r-- | webapp/components/youtube_video.jsx | 2 |
10 files changed, 17 insertions, 20 deletions
diff --git a/webapp/components/admin_console/cluster_settings.jsx b/webapp/components/admin_console/cluster_settings.jsx index 8aab905e4..bbd135e50 100644 --- a/webapp/components/admin_console/cluster_settings.jsx +++ b/webapp/components/admin_console/cluster_settings.jsx @@ -60,7 +60,7 @@ export default class ClusterSettings extends AdminSettings { ); } - overrideHandleChange = (id, value) => { + overrideHandleChange(id, value) { this.setState({ showWarning: true }); @@ -185,4 +185,4 @@ export default class ClusterSettings extends AdminSettings { </SettingsGroup> ); } -}
\ No newline at end of file +} diff --git a/webapp/components/admin_console/cluster_table.jsx b/webapp/components/admin_console/cluster_table.jsx index 4aca796a0..0a2755c4a 100644 --- a/webapp/components/admin_console/cluster_table.jsx +++ b/webapp/components/admin_console/cluster_table.jsx @@ -176,4 +176,4 @@ export default class ClusterTable extends React.Component { </div> ); } -}
\ No newline at end of file +} diff --git a/webapp/components/admin_console/cluster_table_container.jsx b/webapp/components/admin_console/cluster_table_container.jsx index 5dad56469..aad5753b7 100644 --- a/webapp/components/admin_console/cluster_table_container.jsx +++ b/webapp/components/admin_console/cluster_table_container.jsx @@ -18,7 +18,7 @@ export default class ClusterTableContainer extends React.Component { }; } - load = () => { + load() { Client.getClusterStatus( (data) => { this.setState({ @@ -44,7 +44,7 @@ export default class ClusterTableContainer extends React.Component { } } - reload = (e) => { + reload(e) { if (e) { e.preventDefault(); } @@ -68,4 +68,4 @@ export default class ClusterTableContainer extends React.Component { /> ); } -}
\ No newline at end of file +} diff --git a/webapp/components/admin_console/file_upload_setting.jsx b/webapp/components/admin_console/file_upload_setting.jsx index a7df16c0a..0c1efc168 100644 --- a/webapp/components/admin_console/file_upload_setting.jsx +++ b/webapp/components/admin_console/file_upload_setting.jsx @@ -108,7 +108,7 @@ export default class FileUploadSetting extends Setting { disabled={!this.state.fileSelected} onClick={this.handleSubmit} ref='upload_button' - data-loading-text={`<span class=\'glyphicon glyphicon-refresh glyphicon-refresh-animate\'></span> ${this.props.uploadingText}`} + data-loading-text={`<span class='glyphicon glyphicon-refresh glyphicon-refresh-animate'></span> ${this.props.uploadingText}`} > <FormattedMessage id='admin.file_upload.uploadFile' diff --git a/webapp/components/channel_header.jsx b/webapp/components/channel_header.jsx index a281e8e1b..83f667322 100644 --- a/webapp/components/channel_header.jsx +++ b/webapp/components/channel_header.jsx @@ -641,10 +641,10 @@ export default class ChannelHeader extends React.Component { id='channelHeader.removeFromFavorites' defaultMessage='Remove from Favorites' /> : - <FormattedMessage - id='channelHeader.addToFavorites' - defaultMessage='Add to Favorites' - />} + <FormattedMessage + id='channelHeader.addToFavorites' + defaultMessage='Add to Favorites' + />} </Tooltip> ); const toggleFavorite = ( diff --git a/webapp/components/login/login_controller.jsx b/webapp/components/login/login_controller.jsx index fd5413c17..603ec40d6 100644 --- a/webapp/components/login/login_controller.jsx +++ b/webapp/components/login/login_controller.jsx @@ -167,7 +167,6 @@ export default class LoginController extends React.Component { (err) => { if (err.id === 'api.user.login.not_verified.app_error') { browserHistory.push('/should_verify_email?&email=' + encodeURIComponent(loginId)); - return; } else if (err.id === 'store.sql_user.get_for_login.app_error' || err.id === 'ent.ldap.do_login.user_not_registered.app_error') { this.setState({ diff --git a/webapp/components/navbar.jsx b/webapp/components/navbar.jsx index d71fec945..0a5f04394 100644 --- a/webapp/components/navbar.jsx +++ b/webapp/components/navbar.jsx @@ -501,10 +501,10 @@ export default class Navbar extends React.Component { id='channelHeader.removeFromFavorites' defaultMessage='Remove from Favorites' /> : - <FormattedMessage - id='channelHeader.addToFavorites' - defaultMessage='Add to Favorites' - />} + <FormattedMessage + id='channelHeader.addToFavorites' + defaultMessage='Add to Favorites' + />} </a> </li> ); diff --git a/webapp/components/suggestion/at_mention_provider.jsx b/webapp/components/suggestion/at_mention_provider.jsx index d1a03deb5..13b9344ad 100644 --- a/webapp/components/suggestion/at_mention_provider.jsx +++ b/webapp/components/suggestion/at_mention_provider.jsx @@ -112,7 +112,7 @@ export default class AtMentionProvider { handlePretextChanged(suggestionId, pretext) { clearTimeout(this.timeoutId); - const captured = (/(?:^|\W)@([a-z0-9\-\._]*)$/i).exec(pretext.toLowerCase()); + const captured = (/(?:^|\W)@([a-z0-9\-._]*)$/i).exec(pretext.toLowerCase()); if (captured) { const prefix = captured[1]; diff --git a/webapp/components/user_settings/user_settings_modal.jsx b/webapp/components/user_settings/user_settings_modal.jsx index 9112f8711..c1194ed78 100644 --- a/webapp/components/user_settings/user_settings_modal.jsx +++ b/webapp/components/user_settings/user_settings_modal.jsx @@ -104,7 +104,6 @@ class UserSettingsModal extends React.Component { } this.props.onModalDismissed(); - return; } // called after the dialog is fully hidden and faded out @@ -251,7 +250,6 @@ class UserSettingsModal extends React.Component { setRequireConfirm={ (requireConfirm) => { this.requireConfirm = requireConfirm; - return; } } /> diff --git a/webapp/components/youtube_video.jsx b/webapp/components/youtube_video.jsx index 93ea4f946..908a2c74e 100644 --- a/webapp/components/youtube_video.jsx +++ b/webapp/components/youtube_video.jsx @@ -5,7 +5,7 @@ import ChannelStore from 'stores/channel_store.jsx'; import WebClient from 'client/web_client.jsx'; import * as Utils from 'utils/utils.jsx'; -const ytRegex = /(?:http|https):\/\/(?:www\.|m\.)?(?:(?:youtube\.com\/(?:(?:v\/)|(?:(?:watch|embed\/watch)(?:\/|.*v=))|(?:embed\/)|(?:user\/[^\/]+\/u\/[0-9]\/)))|(?:youtu\.be\/))([^#&\?]*)/; +const ytRegex = /(?:http|https):\/\/(?:www\.|m\.)?(?:(?:youtube\.com\/(?:(?:v\/)|(?:(?:watch|embed\/watch)(?:\/|.*v=))|(?:embed\/)|(?:user\/[^/]+\/u\/[0-9]\/)))|(?:youtu\.be\/))([^#&?]*)/; import React from 'react'; |