summary refs log tree commit diff
path: root/webclient/room/room-controller.js
diff options
context:
space:
mode:
authorEmmanuel ROHEE <erohee@amdocs.com>2014-08-14 18:53:05 +0200
committerEmmanuel ROHEE <erohee@amdocs.com>2014-08-18 10:41:21 +0200
commitd5bebc9eaaf4ff0d1abba86fd278e69a9d72ca9c (patch)
tree684b0b8f2f7f4a3c1d4f1e0378d57301459c01ee /webclient/room/room-controller.js
parentmake my emotes white again (diff)
downloadsynapse-d5bebc9eaaf4ff0d1abba86fd278e69a9d72ca9c.tar.xz
Added another button to upload and send an image.
The text input and its send button for sending an image URL will be removed once we have a true upload image service
Diffstat (limited to 'webclient/room/room-controller.js')
-rw-r--r--webclient/room/room-controller.js17
1 files changed, 17 insertions, 0 deletions
diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js

index 30f66de458..5ea01d7641 100644 --- a/webclient/room/room-controller.js +++ b/webclient/room/room-controller.js
@@ -402,6 +402,23 @@ angular.module('RoomController', ['ngSanitize']) }); }; + $scope.imageFileToSend; + $scope.$watch("imageFileToSend", function(newValue, oldValue) { + if ($scope.imageFileToSend) { + // First download the image to the Internet + console.log("Uploading image..."); + mFileUpload.uploadFile($scope.imageFileToSend).then( + function(url) { + // Then share the URL + $scope.sendImage(url); + }, + function(error) { + $scope.feedback = "Can't upload image"; + } + ); + } + }); + $scope.loadMoreHistory = function() { paginate(MESSAGES_PER_PAGINATION); };