From 49a1b4262d1efbadb83d0959339d8b208dd9bc93 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Fri, 14 Nov 2014 11:29:50 +0000 Subject: Use modelService to access room member power levels rather than RoomController. --- syweb/webclient/components/matrix/model-service.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'syweb/webclient/components') 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 -- cgit 1.5.1