Replaced the image URL text input by a file selector button: "Send Image"

1 files changed, 3 insertions, 2 deletions

diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js

index 2fa7fe34b1..ca6d3d4a3a 100644
--- a/webclient/room/room-controller.js
+++ b/webclient/room/room-controller.js
@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 angular.module('RoomController', ['ngSanitize'])
-.controller('RoomController', ['$scope', '$http', '$timeout', '$routeParams', '$location', 'matrixService', 'eventStreamService', 'eventHandlerService',
-                               function($scope, $http, $timeout, $routeParams, $location, matrixService, eventStreamService, eventHandlerService) {
+.controller('RoomController', ['$scope', '$http', '$timeout', '$routeParams', '$location', 'matrixService', 'eventStreamService', 'eventHandlerService', 'mFileUpload',
+                               function($scope, $http, $timeout, $routeParams, $location, matrixService, eventStreamService, eventHandlerService, mFileUpload) {
    'use strict';
     var MESSAGES_PER_PAGINATION = 30;
 
@@ -372,6 +372,7 @@ angular.module('RoomController', ['ngSanitize'])
         matrixService.sendImageMessage($scope.room_id, url).then(
             function() {
                 console.log("Image sent");
+                $scope.state.sending = false;
             },
             function(error) {
                 $scope.feedback = "Failed to send image: " + error.data.error;