summary refs log tree commit diff
path: root/syweb/webclient/components
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-11-14 11:29:50 +0000
committerKegan Dougal <kegan@matrix.org>2014-11-14 11:29:50 +0000
commit49a1b4262d1efbadb83d0959339d8b208dd9bc93 (patch)
tree45ecc72f81ca965404d2b075f10f09aa78a0f974 /syweb/webclient/components
parentUse mUserDisplayName filter in more places. Store power_level[norm] for each ... (diff)
downloadsynapse-49a1b4262d1efbadb83d0959339d8b208dd9bc93.tar.xz
Use modelService to access room member power levels rather than RoomController.
Diffstat (limited to 'syweb/webclient/components')
-rw-r--r--syweb/webclient/components/matrix/model-service.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/syweb/webclient/components/matrix/model-service.js b/syweb/webclient/components/matrix/model-service.js
index 49cf5eff8c..7d7a61cbf8 100644
--- a/syweb/webclient/components/matrix/model-service.js
+++ b/syweb/webclient/components/matrix/model-service.js
@@ -41,6 +41,7 @@ angular.module('modelService', [])
         this.room_id = room_id;
         this.old_room_state = new RoomState();
         this.current_room_state = new RoomState();
+        this.now = this.current_room_state; // makes html access shorter
         this.events = []; // events which can be displayed on the UI. TODO move?
     };
     Room.prototype = {
@@ -125,7 +126,7 @@ angular.module('modelService', [])
                 // normalise power levels: find the max first.
                 var maxPowerLevel = 0;
                 for (var user_id in event.content) {
-                    if (!event.content.hasOwnProperty(user_id)) continue;
+                    if (!event.content.hasOwnProperty(user_id) || user_id === "hsob_ts") continue; // XXX hsob_ts on some old rooms :(
                     maxPowerLevel = Math.max(maxPowerLevel, event.content[user_id]);
                 }
                 // set power level f.e room member