From e6c62d5d7f45234ee574595eeb5ab8b7df41a1ed Mon Sep 17 00:00:00 2001
From: Emmanuel ROHEE <erohee@amdocs.com>
Date: Thu, 14 Aug 2014 18:40:20 +0200
Subject: [PATCH] We can now upload avatar image somewhere
---
webclient/rooms/rooms-controller.js | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/webclient/rooms/rooms-controller.js b/webclient/rooms/rooms-controller.js
index d0924f5887..2ce14e1d49 100644
--- a/webclient/rooms/rooms-controller.js
+++ b/webclient/rooms/rooms-controller.js
@@ -16,9 +16,9 @@ limitations under the License.
'use strict';
-angular.module('RoomsController', ['matrixService', 'mFileInput'])
-.controller('RoomsController', ['$scope', '$location', 'matrixService',
- function($scope, $location, matrixService) {
+angular.module('RoomsController', ['matrixService', 'mFileInput', 'mFileUpload'])
+.controller('RoomsController', ['$scope', '$location', 'matrixService', 'mFileUpload',
+ function($scope, $location, matrixService, mFileUpload) {
$scope.rooms = [];
$scope.public_rooms = [];
@@ -167,7 +167,16 @@ angular.module('RoomsController', ['matrixService', 'mFileInput'])
$scope.$watch("newProfileInfo.avatarFile", function(newValue, oldValue) {
if ($scope.newProfileInfo.avatarFile) {
- //@TODO: Upload this HTML5 image file to somewhere
+ console.log("Uploading new avatar file...");
+ mFileUpload.uploadFile($scope.newProfileInfo.avatarFile).then(
+ function(url) {
+ $scope.newProfileInfo.avatar = url;
+ $scope.setAvatar($scope.newProfileInfo.avatar);
+ },
+ function(error) {
+ $scope.feedback = "Can't upload image";
+ }
+ );
}
});
--
GitLab