diff options
Diffstat (limited to 'webclient/room')
| -rw-r--r-- | webclient/room/room-controller.js | 255 | ||||
| -rw-r--r-- | webclient/room/room.html | 60 |
2 files changed, 238 insertions, 77 deletions
diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js index 1b921325b3..b859f3d7e8 100644 --- a/webclient/room/room-controller.js +++ b/webclient/room/room-controller.js @@ -14,37 +14,100 @@ See the License for the specific language governing permissions and limitations under the License. */ -angular.module('RoomController', []) -// FIXME move directives outta here! -.directive("keepScroll", function(){ - return { - controller : function($scope){ - var element = 0; - this.setElement = function(el){ - element = el; - } - this.addItem = function(item){ - element.scrollTop = (element.scrollTop+item.clientHeight+1); //1px for margin - }; - }, - link : function(scope,el,attr, ctrl) { - ctrl.setElement(el[0]); - } - }; -}) -// FIXME move directives outta here! -.directive("scrollItem", function(){ - return{ - require : "^keepScroll", - link : function(scope, el, att, scrCtrl){ - scrCtrl.addItem(el[0]); - } - } -}) +angular.module('RoomController', ['ngSanitize']) + +.directive('autoComplete', ['$timeout', function ($timeout) { + return function (scope, element, attrs) { + element.bind("keydown keypress", function (event) { + // console.log("event: " + event.which); + if (event.which === 9) { + if (!scope.autoCompleting) { // cache our starting text + // console.log("caching " + element[0].value); + scope.autoCompleteOriginal = element[0].value; + scope.autoCompleting = true; + } + + if (event.shiftKey) { + scope.autoCompleteIndex--; + if (scope.autoCompleteIndex < 0) { + scope.autoCompleteIndex = 0; + } + } + else { + scope.autoCompleteIndex++; + } + + var searchIndex = 0; + var targetIndex = scope.autoCompleteIndex; + var text = scope.autoCompleteOriginal; + + // console.log("targetIndex: " + targetIndex + ", text=" + text); + + // FIXME: use the correct regexp to recognise userIDs + var search = /@?([a-zA-Z0-9_\-:\.]+)$/.exec(text); + if (targetIndex === 0) { + element[0].value = text; + } + else if (search && search[1]) { + // console.log("search found: " + search); + var expansion; + + // FIXME: could do better than linear search here + angular.forEach(scope.members, function(item, name) { + if (item.displayname && searchIndex < targetIndex) { + if (item.displayname.toLowerCase().indexOf(search[1].toLowerCase()) == 0) { + expansion = item.displayname; + searchIndex++; + } + } + }); + if (searchIndex < targetIndex) { // then search raw mxids + angular.forEach(scope.members, function(item, name) { + if (searchIndex < targetIndex) { + if (name.toLowerCase().indexOf(search[1].toLowerCase()) == 1) { + expansion = name; + searchIndex++; + } + } + }); + } + + if (searchIndex === targetIndex) { + // xchat-style tab complete + if (search[0].length === text.length) + expansion += " : "; + else + expansion += " "; + element[0].value = text.replace(/@?([a-zA-Z0-9_\-:\.]+)$/, expansion); + // cancel blink + element[0].className = ""; + } + else { + // console.log("wrapped!"); + element[0].className = "blink"; // XXX: slightly naughty to bypass angular + $timeout(function() { + element[0].className = ""; + }, 150); + element[0].value = text; + scope.autoCompleteIndex = 0; + } + } + else { + scope.autoCompleteIndex = 0; + } + event.preventDefault(); + } + else if (event.which != 16 && scope.autoCompleting) { + scope.autoCompleting = false; + scope.autoCompleteIndex = 0; + } + }); + }; +}]) .controller('RoomController', ['$scope', '$http', '$timeout', '$routeParams', '$location', 'matrixService', 'eventStreamService', 'eventHandlerService', function($scope, $http, $timeout, $routeParams, $location, matrixService, eventStreamService, eventHandlerService) { 'use strict'; - var MESSAGES_PER_PAGINATION = 10; + var MESSAGES_PER_PAGINATION = 30; $scope.room_id = $routeParams.room_id; $scope.room_alias = matrixService.getRoomIdToAliasMapping($scope.room_id); $scope.state = { @@ -52,23 +115,45 @@ angular.module('RoomController', []) events_from: "END", // when to start the event stream from. 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 }; $scope.members = {}; + $scope.autoCompleting = false; + $scope.autoCompleteIndex = 0; + $scope.autoCompleteOriginal = ""; $scope.imageURLToSend = ""; $scope.userIDToInvite = ""; var scrollToBottom = function() { + console.log("Scrolling to bottom"); $timeout(function() { - var objDiv = document.getElementsByClassName("messageTableWrapper")[0]; + var objDiv = document.getElementById("messageTableWrapper"); objDiv.scrollTop = objDiv.scrollHeight; - },0); + }, 0); }; $scope.$on(eventHandlerService.MSG_EVENT, function(ngEvent, event, isLive) { if (isLive && event.room_id === $scope.room_id) { scrollToBottom(); + + if (window.Notification) { + // FIXME: we should also notify based on a timer or other heuristics + // rather than the window being minimised + if (document.hidden) { + var notification = new window.Notification( + ($scope.members[event.user_id].displayname || event.user_id) + + " (" + $scope.room_alias + ")", + { + "body": event.content.body, + "icon": $scope.members[event.user_id].avatar_url, + }); + $timeout(function() { + notification.close(); + }, 5 * 1000); + } + } } }); @@ -82,28 +167,68 @@ angular.module('RoomController', []) $scope.paginateMore = function() { if ($scope.state.can_paginate) { - console.log("Paginating more."); - paginate(MESSAGES_PER_PAGINATION, false); + // console.log("Paginating more."); + paginate(MESSAGES_PER_PAGINATION); } }; - - var paginate = function(numItems, toBottom) { + + var paginate = function(numItems) { + // console.log("paginate " + numItems); + if ($scope.state.paginating) { + return; + } + else { + $scope.state.paginating = true; + } + // console.log("paginateBackMessages from " + $scope.state.earliest_token + " for " + numItems); + var originalTopRow = $("#messageTable>tbody>tr:first")[0]; matrixService.paginateBackMessages($scope.room_id, $scope.state.earliest_token, numItems).then( function(response) { + var firstPagination = !$scope.events.rooms[$scope.room_id]; eventHandlerService.handleEvents(response.data.chunk, false); $scope.state.earliest_token = response.data.end; if (response.data.chunk.length < MESSAGES_PER_PAGINATION) { - // no more messages to paginate :( + // no more messages to paginate. this currently never gets turned true again, as we never + // expire paginated contents in the current implementation. $scope.state.can_paginate = false; } - if (toBottom) { - console.log("Scrolling to bottom"); + $scope.state.paginating = false; + + var wrapper = $("#messageTableWrapper")[0]; + var table = $("#messageTable")[0]; + // console.log("wrapper height=" + wrapper.clientHeight + ", table scrollHeight=" + table.scrollHeight); + + if ($scope.state.can_paginate) { + // check we don't have to pull in more messages + // n.b. we dispatch through a timeout() to allow the digest to run otherwise the .height methods are stale + $timeout(function() { + if (table.scrollHeight < wrapper.clientHeight) { + paginate(MESSAGES_PER_PAGINATION); + scrollToBottom(); + } + }, 0); + } + + if (firstPagination) { scrollToBottom(); } + else { + // lock the scroll position + $timeout(function() { + // FIXME: this risks a flicker before the scrollTop is actually updated, but we have to + // dispatch it into a function in order to first update the layout. The right solution + // might be to implement it as a directive, more like + // http://stackoverflow.com/questions/23736647/how-to-retain-scroll-position-of-ng-repeat-in-angularjs + // however, this specific solution breaks because it measures the rows height before + // the contents are interpolated. + wrapper.scrollTop = originalTopRow ? (originalTopRow.offsetTop + wrapper.scrollTop) : 0; + }, 0); + } }, function(error) { console.log("Failed to paginateBackMessages: " + JSON.stringify(error)); + $scope.state.paginating = false; } ) }; @@ -111,11 +236,26 @@ angular.module('RoomController', []) var updateMemberList = function(chunk) { var isNewMember = !(chunk.target_user_id in $scope.members); if (isNewMember) { + // FIXME: why are we copying these fields around inside chunk? if ("state" in chunk.content) { - chunk.presenceState = chunk.content.state; + chunk.presenceState = chunk.content.state; // why is this renamed? } - + if ("mtime_age" in chunk.content) { + chunk.mtime_age = chunk.content.mtime_age; + } +/* + // FIXME: once the HS reliably returns the displaynames & avatar_urls for both + // local and remote users, we should use this rather than the evalAsync block + // below + if ("displayname" in chunk.content) { + chunk.displayname = chunk.content.displayname; + } + if ("avatar_url" in chunk.content) { + chunk.avatar_url = chunk.content.avatar_url; + } + */ $scope.members[chunk.target_user_id] = chunk; + // get their display name and profile picture and set it to their // member entry in $scope.members. We HAVE to use $timeout with 0 delay // to make this function run AFTER the current digest cycle, else the @@ -154,16 +294,14 @@ angular.module('RoomController', []) } var member = $scope.members[chunk.content.user_id]; + // XXX: why not just pass the chunk straight through? if ("state" in chunk.content) { - if (chunk.content.state === "online") { - member.presenceState = "online"; - } - else if (chunk.content.state === "offline") { - member.presenceState = "offline"; - } - else if (chunk.content.state === "unavailable") { - member.presenceState = "unavailable"; - } + member.presenceState = chunk.content.state; + } + + if ("mtime_age" in chunk.content) { + // FIXME: should probably keep updating mtime_age in realtime like FB does + member.mtime_age = chunk.content.mtime_age; } // this may also contain a new display name or avatar url, so check. @@ -223,7 +361,7 @@ angular.module('RoomController', []) } ); - paginate(MESSAGES_PER_PAGINATION, true); + paginate(MESSAGES_PER_PAGINATION); }, function(reason) { $scope.feedback = "Can't join room: " + reason; @@ -264,7 +402,24 @@ angular.module('RoomController', []) }); }; + $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, false); + paginate(MESSAGES_PER_PAGINATION); }; }]); diff --git a/webclient/room/room.html b/webclient/room/room.html index e2a4c221c6..106a9dfd15 100644 --- a/webclient/room/room.html +++ b/webclient/room/room.html @@ -1,45 +1,47 @@ <div ng-controller="RoomController" data-ng-init="onInit()" class="room"> - <div class="page"> - <div class="wrapper"> + <div id="page"> + <div id="wrapper"> - <div class="roomName"> + <div id="roomName"> {{ room_alias || room_id }} </div> - <div class="usersTableWrapper"> - <table class="usersTable"> - <tr ng-repeat="(name, info) in members"> + <div id="usersTableWrapper"> + <table id="usersTable"> + <tr ng-repeat="member in members | orderMembersList"> <td class="userAvatar"> - <img class="userAvatarImage" ng-src="{{info.avatar_url || 'img/default-profile.jpg'}}" width="80" height="80"/> + <img class="userAvatarImage" ng-src="{{member.avatar_url || 'img/default-profile.jpg'}}" width="80" height="80"/> <img class="userAvatarGradient" src="img/gradient.png" width="80" height="24"/> - <!-- FIXME: does allowing <wbr/> to be unescaped introduce HTML injections from user IDs and display names? --> - <div class="userName" ng-bind-html="info.displayname || (name.substr(0, name.indexOf(':')) + '<wbr/>' + name.substr(name.indexOf(':'))) | to_trusted"></div> + <div class="userName">{{ member.displayname || member.id.substr(0, member.id.indexOf(':')) }}<br/>{{ member.displayname ? "" : member.id.substr(member.id.indexOf(':')) }}</div> + </td> + <td class="userPresence" ng-class="member.presenceState === 'online' ? 'online' : (member.presenceState === 'unavailable' ? 'unavailable' : '')"> + {{ member.mtime_age | duration }}<br/>{{ member.mtime_age ? "ago" : "" }} </td> - <td class="userPresence" ng-class="info.presenceState === 'online' ? 'online' : (info.presenceState === 'unavailable' ? 'unavailable' : '')" /> </table> </div> - <div class="messageTableWrapper" keep-scroll> - <table class="messageTable" infinite-scroll="paginateMore()"> - <tr ng-repeat="msg in events.rooms[room_id].messages" ng-class="msg.user_id === state.user_id ? 'mine' : ''" scroll-item> + <div id="messageTableWrapper" keep-scroll> + <table id="messageTable" infinite-scroll="paginateMore()"> + <tr ng-repeat="msg in events.rooms[room_id].messages" + ng-class="(events.rooms[room_id].messages[$index - 1].user_id !== msg.user_id ? 'differentUser' : '') + (msg.user_id === state.user_id ? ' mine' : '')" scroll-item> <td class="leftBlock"> <div class="sender" ng-hide="events.rooms[room_id].messages[$index - 1].user_id === msg.user_id">{{ members[msg.user_id].displayname || msg.user_id }}</div> <div class="timestamp">{{ msg.content.hsob_ts | date:'MMM d HH:mm:ss' }}</div> </td> <td class="avatar"> - <img ng-src="{{ members[msg.user_id].avatar_url || 'img/default-profile.jpg' }}" width="32" height="32" + <img class="avatarImage" ng-src="{{ members[msg.user_id].avatar_url || 'img/default-profile.jpg' }}" width="32" height="32" ng-hide="events.rooms[room_id].messages[$index - 1].user_id === msg.user_id || msg.user_id === state.user_id"/> </td> - <td ng-class="!msg.content.membership_target ? (msg.content.msgtype === 'm.emote' ? 'emote text' : 'text') : ''"> + <td ng-class="!msg.content.membership_target ? (msg.content.msgtype === 'm.emote' ? 'emote text' : 'text') : 'membership text'"> <div class="bubble"> - {{ msg.content.msgtype === "m.emote" ? ("* " + (members[msg.user_id].displayname || msg.user_id) + " " + msg.content.body) : "" }} - {{ msg.content.msgtype === "m.text" ? msg.content.body : "" }} + <span ng-hide='msg.content.msgtype !== "m.emote"' ng-bind-html="'* ' + (members[msg.user_id].displayname || msg.user_id) + ' ' + msg.content.body | linky:'_blank'"/> + <span ng-hide='msg.content.msgtype !== "m.text"' ng-bind-html="msg.content.body | linky:'_blank'"/> <img class="image" ng-hide='msg.content.msgtype !== "m.image"' ng-src="{{ msg.content.url }}" alt="{{ msg.content.body }}"/> </div> </td> <td class="rightBlock"> - <img ng-src="{{ members[msg.user_id].avatar_url || 'img/default-profile.jpg' }}" width="32" height="32" + <img class="avatarImage" ng-src="{{ members[msg.user_id].avatar_url || 'img/default-profile.jpg' }}" width="32" height="32" ng-hide="events.rooms[room_id].messages[$index - 1].user_id === msg.user_id || msg.user_id !== state.user_id"/> </td> </tr> @@ -49,34 +51,37 @@ </div> </div> - <div class="controlPanel"> - <div class="controls"> - <table class="inputBarTable"> + <div id="controlPanel"> + <div id="controls"> + <table id="inputBarTable"> <tr> <td width="1"> {{ state.user_id }} </td> <td width="*" style="min-width: 100px"> - <input class="mainInput" ng-model="textInput" ng-enter="send()" ng-focus="true"/> + <input id="mainInput" ng-model="textInput" ng-enter="send()" ng-focus="true" auto-complete/> </td> <td width="1"> <button ng-click="send()">Send</button> </td> <td width="1"> - {{ feedback }} + </td> </tr> <tr> <td> </td> <td> - <input class="mainInput" ng-model="imageURLToSend" ng-enter="sendImage()" placeholder="Image URL"/> + <input id="mainInput" ng-model="imageURLToSend" ng-enter="sendImage()" placeholder="Image URL"/> </td> - <td width="100px"> - <button ng-click="sendImage(imageURLToSend)">Send Image</button> + <td width="100px"> + <button ng-click="sendImage(imageURLToSend)">Send URL</button> </td> - <td> + <!-- TODO: To enable once we have an upload server + <td width="100px"> + <button m-file-input="imageFileToSend">Send Image</button> </td> + --> </tr> </table> @@ -87,6 +92,7 @@ </span> <button ng-click="leaveRoom()">Leave</button> <button ng-click="loadMoreHistory()" ng-disabled="!state.can_paginate">Load more history</button> + {{ feedback }} <div ng-hide="!state.stream_failure"> {{ state.stream_failure.data.error || "Connection failure" }} </div> |