From 831c218a9312d15ab57d6d81f84f18fd332a4166 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 16 Aug 2014 22:21:52 +0100
Subject: autohyperlink messages using linky

---
 webclient/room/room-controller.js | 2 +-
 webclient/room/room.html          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'webclient/room')

diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js
index fa50236571..86f1379f75 100644
--- a/webclient/room/room-controller.js
+++ b/webclient/room/room-controller.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-angular.module('RoomController', [])
+angular.module('RoomController', ['ngSanitize'])
 
 .controller('RoomController', ['$scope', '$http', '$timeout', '$routeParams', '$location', 'matrixService', 'eventStreamService', 'eventHandlerService',
                                function($scope, $http, $timeout, $routeParams, $location, matrixService, eventStreamService, eventHandlerService) {
diff --git a/webclient/room/room.html b/webclient/room/room.html
index 5712ce9b4f..2726188b4b 100644
--- a/webclient/room/room.html
+++ b/webclient/room/room.html
@@ -34,8 +34,8 @@
                 </td>
                 <td ng-class="!msg.content.membership_target ? (msg.content.msgtype === 'm.emote' ? 'emote text' : '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>
-- 
cgit 1.5.1