From d5bebc9eaaf4ff0d1abba86fd278e69a9d72ca9c Mon Sep 17 00:00:00 2001 From: Emmanuel ROHEE Date: Thu, 14 Aug 2014 18:53:05 +0200 Subject: [PATCH] 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 --- webclient/room/room-controller.js | 17 +++++++++++++++++ webclient/room/room.html | 5 +++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js index 30f66de45..5ea01d764 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); }; diff --git a/webclient/room/room.html b/webclient/room/room.html index 7ec2c7cdc..0f01b94c3 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -75,9 +75,10 @@ - + - + +