diff options
author | Asaad Mahmood <Unknowngi@live.com> | 2015-10-02 22:26:28 +0500 |
---|---|---|
committer | Asaad Mahmood <Unknowngi@live.com> | 2015-10-02 22:26:28 +0500 |
commit | d8c5c4f7468bb07d8de904437726557c6fa9b436 (patch) | |
tree | c19af28e1ad6c2bf068bf64956461c25502f9bb3 /web/react/utils | |
parent | 813792dd600f4e485d52cc1066a8c1297578432d (diff) | |
parent | 41069d83d2b6ad5cca599f75292027e13d5b10f7 (diff) | |
download | chat-d8c5c4f7468bb07d8de904437726557c6fa9b436.tar.gz chat-d8c5c4f7468bb07d8de904437726557c6fa9b436.tar.bz2 chat-d8c5c4f7468bb07d8de904437726557c6fa9b436.zip |
Merge branch 'master' of https://github.com/mattermost/platform into plt-375
Conflicts:
web/react/components/user_settings/user_settings_appearance.jsx
Diffstat (limited to 'web/react/utils')
-rw-r--r-- | web/react/utils/async_client.jsx | 16 | ||||
-rw-r--r-- | web/react/utils/client.jsx | 20 | ||||
-rw-r--r-- | web/react/utils/text_formatting.jsx | 6 |
3 files changed, 30 insertions, 12 deletions
diff --git a/web/react/utils/async_client.jsx b/web/react/utils/async_client.jsx index ab2965000..7db3ef30d 100644 --- a/web/react/utils/async_client.jsx +++ b/web/react/utils/async_client.jsx @@ -152,21 +152,23 @@ export function getChannel(id) { } export function updateLastViewedAt() { - if (isCallInProgress('updateLastViewed')) { + const channelId = ChannelStore.getCurrentId(); + + if (channelId === null) { return; } - if (ChannelStore.getCurrentId() == null) { + if (isCallInProgress(`updateLastViewed${channelId}`)) { return; } - callTracker.updateLastViewed = utils.getTimestamp(); + callTracker[`updateLastViewed${channelId}`] = utils.getTimestamp(); client.updateLastViewedAt( - ChannelStore.getCurrentId(), - function updateLastViewedAtSuccess() { + channelId, + () => { callTracker.updateLastViewed = 0; }, - function updateLastViewdAtFailure(err) { + (err) => { callTracker.updateLastViewed = 0; dispatchError(err, 'updateLastViewedAt'); } @@ -634,4 +636,4 @@ export function getMyTeam() { dispatchError(err, 'getMyTeam'); } ); -}
\ No newline at end of file +} diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx index 715e26197..5cb165b4c 100644 --- a/web/react/utils/client.jsx +++ b/web/react/utils/client.jsx @@ -332,6 +332,20 @@ export function saveConfig(config, success, error) { }); } +export function logClientError(msg) { + var l = {}; + l.level = 'ERROR'; + l.message = msg; + + $.ajax({ + url: '/api/v1/admin/log_client', + dataType: 'json', + contentType: 'application/json', + type: 'POST', + data: JSON.stringify(l) + }); +} + export function testEmail(config, success, error) { $.ajax({ url: '/api/v1/admin/test_email', @@ -568,16 +582,16 @@ export function updateChannelDesc(data, success, error) { track('api', 'api_channels_desc'); } -export function updateNotifyLevel(data, success, error) { +export function updateNotifyProps(data, success, error) { $.ajax({ - url: '/api/v1/channels/update_notify_level', + url: '/api/v1/channels/update_notify_props', dataType: 'json', contentType: 'application/json', type: 'POST', data: JSON.stringify(data), success, error: function onError(xhr, status, err) { - var e = handleError('updateNotifyLevel', xhr, status, err); + var e = handleError('updateNotifyProps', xhr, status, err); error(e); } }); diff --git a/web/react/utils/text_formatting.jsx b/web/react/utils/text_formatting.jsx index 56bf49c3f..34e42cbae 100644 --- a/web/react/utils/text_formatting.jsx +++ b/web/react/utils/text_formatting.jsx @@ -87,8 +87,10 @@ function autolinkUrls(text, tokens) { const linkText = match.getMatchedText(); let url = linkText; - if (url.lastIndexOf('http', 0) !== 0) { - url = `http://${linkText}`; + if (match.getType() === 'email') { + url = `mailto:${url}`; + } else if (url.lastIndexOf('http', 0) !== 0) { + url = `http://${url}`; } const index = tokens.size; |