From 7b8e24a588c394ff5c735b966078fe282dc5b833 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Wed, 24 Sep 2014 01:12:59 +0100 Subject: [PATCH] close buttons on recents (SYWEB-68) --- webclient/app-controller.js | 10 ++++++++++ webclient/recents/recents.html | 4 +++- webclient/room/room-controller.js | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/webclient/app-controller.js b/webclient/app-controller.js index 0e823b43e..7d6120755 100644 --- a/webclient/app-controller.js +++ b/webclient/app-controller.js @@ -67,6 +67,16 @@ angular.module('MatrixWebClientController', ['matrixService', 'mPresence', 'even } }; + $scope.leave = function(room_id) { + matrixService.leave(room_id).then( + function(response) { + console.log("Left room " + room_id); + }, + function(error) { + console.log("Failed to leave room " + room_id + ": " + error.data.error); + }); + }; + // Logs the user out $scope.logout = function() { diff --git a/webclient/recents/recents.html b/webclient/recents/recents.html index edfc1677e..ff811b2b8 100644 --- a/webclient/recents/recents.html +++ b/webclient/recents/recents.html @@ -2,7 +2,7 @@ diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js index ff0f1e05f..384d7dc9a 100644 --- a/webclient/room/room-controller.js +++ b/webclient/room/room-controller.js @@ -829,7 +829,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput']) matrixService.leave($scope.room_id).then( function(response) { - console.log("Left room "); + console.log("Left room " + $scope.room_id); $location.url("home"); }, function(error) {
@@ -19,6 +19,8 @@ {{ lastMsg = eventHandlerService.getLastMessage(room.room_id, true);"" }} {{ (lastMsg.ts) | date:'MMM d HH:mm' }} + + close