diff --git a/webclient/components/matrix/event-stream-service.js b/webclient/components/matrix/event-stream-service.js
index c94cf0fe72..a446fad5d4 100644
--- a/webclient/components/matrix/event-stream-service.js
+++ b/webclient/components/matrix/event-stream-service.js
@@ -25,7 +25,6 @@ the eventHandlerService.
angular.module('eventStreamService', [])
.factory('eventStreamService', ['$q', '$timeout', 'matrixService', 'eventHandlerService', function($q, $timeout, matrixService, eventHandlerService) {
var END = "END";
- var START = "START";
var TIMEOUT_MS = 30000;
var ERR_TIMEOUT_MS = 5000;
diff --git a/webclient/components/matrix/matrix-service.js b/webclient/components/matrix/matrix-service.js
index 2463b51203..664c5967af 100644
--- a/webclient/components/matrix/matrix-service.js
+++ b/webclient/components/matrix/matrix-service.js
@@ -239,8 +239,8 @@ angular.module('matrixService', [])
path = path.replace("$room_id", room_id);
var params = {
from: from_token,
- to: "START",
- limit: limit
+ limit: limit,
+ dir: 'b'
};
return doRequest("GET", path, params);
},
diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js
index 364ca41510..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;
@@ -30,7 +30,8 @@ angular.module('RoomController', ['ngSanitize'])
earliest_token: "END", // stores how far back we've paginated.
can_paginate: true, // this is toggled off when we run out of items
paginating: false, // used to avoid concurrent pagination requests pulling in dup contents
- stream_failure: undefined // the response when the stream fails
+ stream_failure: undefined, // the response when the stream fails
+ sending: false // true when a message is being sent. It helps to disable the UI when a process is running
};
$scope.members = {};
$scope.autoCompleting = false;
@@ -232,7 +233,9 @@ angular.module('RoomController', ['ngSanitize'])
if ($scope.textInput == "") {
return;
}
-
+
+ $scope.state.sending = true;
+
// Send the text message
var promise;
// FIXME: handle other commands too
@@ -247,10 +250,12 @@ angular.module('RoomController', ['ngSanitize'])
function() {
console.log("Sent message");
$scope.textInput = "";
+ $scope.state.sending = false;
},
function(error) {
$scope.feedback = "Failed to send: " + error.data.error;
- });
+ $scope.state.sending = false;
+ });
};
$scope.onInit = function() {
@@ -362,18 +367,25 @@ angular.module('RoomController', ['ngSanitize'])
};
$scope.sendImage = function(url) {
+ $scope.state.sending = true;
+
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;
+ $scope.state.sending = false;
});
};
$scope.imageFileToSend;
$scope.$watch("imageFileToSend", function(newValue, oldValue) {
if ($scope.imageFileToSend) {
+
+ $scope.state.sending = true;
+
// First download the image to the Internet
console.log("Uploading image...");
mFileUpload.uploadFile($scope.imageFileToSend).then(
@@ -383,6 +395,7 @@ angular.module('RoomController', ['ngSanitize'])
},
function(error) {
$scope.feedback = "Can't upload image";
+ $scope.state.sending = false;
}
);
}
diff --git a/webclient/room/room.html b/webclient/room/room.html
index 8cae7ee515..99b0bf681b 100644
--- a/webclient/room/room.html
+++ b/webclient/room/room.html
@@ -63,30 +63,16 @@
{{ state.user_id }}
</td>
<td width="*" style="min-width: 100px">
- <input id="mainInput" ng-model="textInput" ng-enter="send()" ng-focus="true" auto-complete/>
+ <input id="mainInput" ng-model="textInput" ng-enter="send()" ng-disabled="state.sending" ng-focus="true" auto-complete/>
</td>
- <td width="1">
- <button ng-click="send()">Send</button>
+ <td width="150px">
+ <button ng-click="send()" ng-disabled="state.sending">Send</button>
+ <button m-file-input="imageFileToSend">Send Image</button>
</td>
<td width="1">
</td>
</tr>
- <tr>
- <td>
- </td>
- <td>
- <input id="mainInput" ng-model="imageURLToSend" ng-enter="sendImage(imageURLToSend)" placeholder="Image URL"/>
- </td>
- <td width="100px">
- <button ng-click="sendImage(imageURLToSend)">Send URL</button>
- </td>
- <!-- TODO: To enable once we have an upload server
- <td width="100px">
- <button m-file-input="imageFileToSend">Send Image</button>
- </td>
- -->
- </tr>
</table>
<span>
|
