summaryrefslogtreecommitdiffstats
path: root/web/react/utils
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-12-28 08:59:23 -0500
committerJoram Wilander <jwawilander@gmail.com>2015-12-28 08:59:23 -0500
commit0b55c5f86186ee5cce9cf29f3f560b2dd5b15277 (patch)
treeada7aa42d9102fabbcd0e91979be63de8dfed08f /web/react/utils
parentf9f6b0cea3e16038aacb454486a7f9fec037127a (diff)
parentcfdc5ab9998a86a8b540d8f5d5a7b429e919e4d6 (diff)
downloadchat-0b55c5f86186ee5cce9cf29f3f560b2dd5b15277.tar.gz
chat-0b55c5f86186ee5cce9cf29f3f560b2dd5b15277.tar.bz2
chat-0b55c5f86186ee5cce9cf29f3f560b2dd5b15277.zip
Merge pull request #1755 from hmhealey/plt1108
PLT-1108 Refactored ViewImage modal and made it automatically play animated gifs
Diffstat (limited to 'web/react/utils')
-rw-r--r--web/react/utils/async_client.jsx28
-rw-r--r--web/react/utils/client.jsx4
-rw-r--r--web/react/utils/constants.jsx1
3 files changed, 32 insertions, 1 deletions
diff --git a/web/react/utils/async_client.jsx b/web/react/utils/async_client.jsx
index 88b5aa739..f218270da 100644
--- a/web/react/utils/async_client.jsx
+++ b/web/react/utils/async_client.jsx
@@ -769,3 +769,31 @@ export function getSuggestedCommands(command, suggestionId, component) {
}
);
}
+
+export function getFileInfo(filename) {
+ const callName = 'getFileInfo' + filename;
+
+ if (isCallInProgress(callName)) {
+ return;
+ }
+
+ callTracker[callName] = utils.getTimestamp();
+
+ client.getFileInfo(
+ filename,
+ (data) => {
+ callTracker[callName] = 0;
+
+ AppDispatcher.handleServerAction({
+ type: ActionTypes.RECIEVED_FILE_INFO,
+ filename,
+ info: data
+ });
+ },
+ (err) => {
+ callTracker[callName] = 0;
+
+ dispatchError(err, 'getFileInfo');
+ }
+ );
+}
diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx
index a12e85f67..1c417153b 100644
--- a/web/react/utils/client.jsx
+++ b/web/react/utils/client.jsx
@@ -1076,7 +1076,9 @@ export function getFileInfo(filename, success, error) {
dataType: 'json',
contentType: 'application/json',
type: 'GET',
- success,
+ success: (data) => {
+ success(data);
+ },
error: function onError(xhr, status, err) {
var e = handleError('getFileInfo', xhr, status, err);
error(e);
diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx
index 29c5ecc5d..ea4921417 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -37,6 +37,7 @@ export default {
RECIEVED_STATUSES: null,
RECIEVED_PREFERENCE: null,
RECIEVED_PREFERENCES: null,
+ RECIEVED_FILE_INFO: null,
RECIEVED_MSG: null,