summary refs log tree commit diff
path: root/syweb/webclient/components
diff options
context:
space:
mode:
Diffstat (limited to 'syweb/webclient/components')
-rw-r--r--syweb/webclient/components/fileInput/file-input-directive.js3
-rw-r--r--syweb/webclient/components/fileUpload/file-upload-service.js226
2 files changed, 129 insertions, 100 deletions
diff --git a/syweb/webclient/components/fileInput/file-input-directive.js b/syweb/webclient/components/fileInput/file-input-directive.js
index 9c849a140f..e530c06085 100644
--- a/syweb/webclient/components/fileInput/file-input-directive.js
+++ b/syweb/webclient/components/fileInput/file-input-directive.js
@@ -25,7 +25,8 @@ angular.module('mFileInput', [])
     return {
         restrict: 'A',
         transclude: 'true',
-        template: '<div ng-transclude></div><input ng-hide="true" type="file" accept="image/*"/>',
+        // FIXME: add back in accept="image/*" when needed - e.g. for avatars
+        template: '<div ng-transclude></div><input ng-hide="true" type="file"/>',
         scope: {
             selectedFile: '=mFileInput'
         },
diff --git a/syweb/webclient/components/fileUpload/file-upload-service.js b/syweb/webclient/components/fileUpload/file-upload-service.js
index b544e29509..28e3f0ff5e 100644
--- a/syweb/webclient/components/fileUpload/file-upload-service.js
+++ b/syweb/webclient/components/fileUpload/file-upload-service.js
@@ -47,30 +47,31 @@ angular.module('mFileUpload', ['matrixService', 'mUtilities'])
     };
     
     /*
-     * Upload an image file plus generate a thumbnail of it and upload it so that
+     * Upload an filmessagee plus generate a thumbnail of it (if possible) and upload it so that
      * we will have all information to fulfill an image message request data.
-     * @param {File} imageFile the imageFile to send
+     * @param {File} file the file to send
      * @param {Integer} thumbnailSize the max side size of the thumbnail to create
      * @returns {promise} A promise that will be resolved by a image message object
      *   ready to be send with the Matrix API
      */
-    this.uploadImageAndThumbnail = function(imageFile, thumbnailSize) {
+    this.uploadFileAndThumbnail = function(file, thumbnailSize) {
         var self = this;
         var deferred = $q.defer();
 
-        console.log("uploadImageAndThumbnail " + imageFile.name + " - thumbnailSize: " + thumbnailSize);
+        console.log("uploadFileAndThumbnail " + file.name + " - thumbnailSize: " + thumbnailSize);
 
-        // The message structure that will be returned in the promise
-        var imageMessage = {
+        // The message structure that will be returned in the promise will look something like:
+        var message = {
+/*            
             msgtype: "m.image",
             url: undefined,
             body: "Image",
             info: {
                 size: undefined,
-                w: undefined,
-                h: undefined,
+                  w: undefined,
+                  h: undefined,
                 mimetype: undefined
-            },
+            },            
             thumbnail_url: undefined,
             thumbnail_info: {
                 size: undefined,
@@ -78,101 +79,128 @@ angular.module('mFileUpload', ['matrixService', 'mUtilities'])
                 h: undefined,
                 mimetype: undefined
             }
+*/            
         };
 
-        // First, get the image size
-        mUtilities.getImageSize(imageFile).then(
-            function(size) {
-                console.log("image size: " + JSON.stringify(size));
-
-                // The final operation: send imageFile
-                var uploadImage = function() {
-                    self.uploadFile(imageFile).then(
-                        function(url) {
-                            // Update message metadata
-                            imageMessage.url = url;
-                            imageMessage.info = {
-                                size: imageFile.size,
-                                w: size.width,
-                                h: size.height,
-                                mimetype: imageFile.type
-                            };
-
-                            // If there is no thumbnail (because the original image is smaller than thumbnailSize),
-                            // reuse the original image info for thumbnail data
-                            if (!imageMessage.thumbnail_url) {
-                                imageMessage.thumbnail_url = imageMessage.url;
-                                imageMessage.thumbnail_info = imageMessage.info;
-                            }
-
-                            // We are done
-                            deferred.resolve(imageMessage);
-                        },
-                        function(error) {
-                            console.log("      -> Can't upload image");
-                            deferred.reject(error); 
-                        }
-                    );
-                };
-
-                // Create a thumbnail if the image size exceeds thumbnailSize
-                if (Math.max(size.width, size.height) > thumbnailSize) {
-                    console.log("    Creating thumbnail...");
-                    mUtilities.resizeImage(imageFile, thumbnailSize).then(
-                        function(thumbnailBlob) {
-
-                            // Get its size
-                            mUtilities.getImageSize(thumbnailBlob).then(
-                                function(thumbnailSize) {
-                                    console.log("      -> Thumbnail size: " + JSON.stringify(thumbnailSize));
-
-                                    // Upload it to the server
-                                    self.uploadFile(thumbnailBlob).then(
-                                        function(thumbnailUrl) {
-
-                                            // Update image message data
-                                            imageMessage.thumbnail_url = thumbnailUrl;
-                                            imageMessage.thumbnail_info = {
-                                                size: thumbnailBlob.size,
-                                                w: thumbnailSize.width,
-                                                h: thumbnailSize.height,
-                                                mimetype: thumbnailBlob.type
-                                            };
-
-                                            // Then, upload the original image
-                                            uploadImage();
-                                        },
-                                        function(error) {
-                                            console.log("      -> Can't upload thumbnail");
-                                            deferred.reject(error); 
-                                        }
-                                    );
-                                },
-                                function(error) {
-                                    console.log("      -> Failed to get thumbnail size");
-                                    deferred.reject(error); 
+        if (file.type.indexOf("image/") === 0) {
+            // it's an image - try to do clientside thumbnailing.
+            mUtilities.getImageSize(file).then(
+                function(size) {
+                    console.log("image size: " + JSON.stringify(size));
+
+                    // The final operation: send file
+                    var uploadImage = function() {
+                        self.uploadFile(file).then(
+                            function(url) {
+                                // Update message metadata
+                                message.url = url;
+                                message.msgtype = "m.image";
+                                message.body = file.name;
+                                message.info = {
+                                    size: file.size,
+                                    w: size.width,
+                                    h: size.height,
+                                    mimetype: file.type
+                                };
+
+                                // If there is no thumbnail (because the original image is smaller than thumbnailSize),
+                                // reuse the original image info for thumbnail data
+                                if (!message.thumbnail_url) {
+                                    message.thumbnail_url = message.url;
+                                    message.thumbnail_info = message.info;
                                 }
-                            );
-
-                        },
-                        function(error) {
-                            console.log("      -> Failed to create thumbnail: " + error);
-                            deferred.reject(error); 
-                        }
-                    );
+
+                                // We are done
+                                deferred.resolve(message);
+                            },
+                            function(error) {
+                                console.log("      -> Can't upload image");
+                                deferred.reject(error); 
+                            }
+                        );
+                    };
+
+                    // Create a thumbnail if the image size exceeds thumbnailSize
+                    if (Math.max(size.width, size.height) > thumbnailSize) {
+                        console.log("    Creating thumbnail...");
+                        mUtilities.resizeImage(file, thumbnailSize).then(
+                            function(thumbnailBlob) {
+
+                                // Get its size
+                                mUtilities.getImageSize(thumbnailBlob).then(
+                                    function(thumbnailSize) {
+                                        console.log("      -> Thumbnail size: " + JSON.stringify(thumbnailSize));
+
+                                        // Upload it to the server
+                                        self.uploadFile(thumbnailBlob).then(
+                                            function(thumbnailUrl) {
+
+                                                // Update image message data
+                                                message.thumbnail_url = thumbnailUrl;
+                                                message.thumbnail_info = {
+                                                    size: thumbnailBlob.size,
+                                                    w: thumbnailSize.width,
+                                                    h: thumbnailSize.height,
+                                                    mimetype: thumbnailBlob.type
+                                                };
+
+                                                // Then, upload the original image
+                                                uploadImage();
+                                            },
+                                            function(error) {
+                                                console.log("      -> Can't upload thumbnail");
+                                                deferred.reject(error); 
+                                            }
+                                        );
+                                    },
+                                    function(error) {
+                                        console.log("      -> Failed to get thumbnail size");
+                                        deferred.reject(error); 
+                                    }
+                                );
+
+                            },
+                            function(error) {
+                                console.log("      -> Failed to create thumbnail: " + error);
+                                deferred.reject(error); 
+                            }
+                        );
+                    }
+                    else {
+                        // No need of thumbnail
+                        console.log("   Thumbnail is not required");
+                        uploadImage();
+                    }
+
+                },
+                function(error) {
+                    console.log("   -> Failed to get image size");
+                    deferred.reject(error); 
                 }
-                else {
-                    // No need of thumbnail
-                    console.log("   Thumbnail is not required");
-                    uploadImage();
+            );
+        }
+        else {
+            // it's a random file - just upload it.
+            self.uploadFile(file).then(
+                function(url) {
+                    // Update message metadata
+                    message.url = url;
+                    message.msgtype = "m.file";
+                    message.body = file.name;
+                    message.info = {
+                        size: file.size,
+                        mimetype: file.type
+                    };
+
+                    // We are done
+                    deferred.resolve(message);
+                },
+                function(error) {
+                    console.log("      -> Can't upload file");
+                    deferred.reject(error); 
                 }
-
-            },
-            function(error) {
-                console.log("   -> Failed to get image size");
-                deferred.reject(error); 
-            }
-        );
+            );
+        }
 
         return deferred.promise;
     };