BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix problem where listners window will display wrong name as data gets cached in listenerItem. When a user leaves and joins

Browse Source 
the old value of that listener item gets displayed
This commit is contained in:
Richard Alam 2011-10-25 15:51:04 -04:00
parent 2564314aac
commit 719d6b5ee0
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bigbluebutton-client/src/org/bigbluebutton/modules/listeners/business/ListenersSOService.as
View File

@ -108,12 +108,21 @@ package org.bigbluebutton.modules.listeners.business
_connectionListener = connectionListener;
}
private function stripUseridFromUsername(uname:String):String {
var pattern:RegExp = /(\d*)-(\w*)$/;
var result:Object = pattern.exec(uname);
if (result != null) {
return result[2];
}
return uname;
}
public function userJoin(userId:Number, cidName:String, cidNum:String,
muted:Boolean, talking:Boolean, locked:Boolean):void
{
if (! _listeners.hasListener(userId)) {
var n:Listener = new Listener();
n.callerName = (cidName != null) ? cidName : "<Unknown Caller>";
n.callerName = (cidName != null) ? stripUseridFromUsername(cidName) : "<Unknown Caller>";
n.callerNumber = cidNum;
n.muted = muted;
n.userid = userId;

21
bigbluebutton-client/src/org/bigbluebutton/modules/listeners/views/ListenerItem.mxml
View File

@ -26,14 +26,10 @@
<mx:Script>
<![CDATA[
import flash.events.MouseEvent;
import mx.binding.utils.BindingUtils;
import mx.collections.ArrayCollection;
import flash.events.MouseEvent;
import mx.controls.Image;
import mx.controls.Label;
import mx.controls.TileList;
import mx.controls.TileList;
import org.bigbluebutton.common.Images;
import org.bigbluebutton.modules.listeners.events.ListenersCommand;
import org.bigbluebutton.util.i18n.ResourceUtil;
@ -48,8 +44,6 @@
[Bindable] private var ejectIcon:Class = images.delete_icon;
[Bindable] private var statusTooltip : String = "";
[Bindable] private var ejectTooltip : String = ResourceUtil.getInstance().getString('bbb.listeners.ejectTooltip');
[Bindable] private var username:String = "init";
[Bindable] private var moderator:Boolean = false;
public function onRollOver():void{
@ -91,21 +85,12 @@
}
private function onCreationComplete():void {
BindingUtils.bindSetter(stripUseridFromUsername, data, "callerName");
if ((data != null) && data.moderator) muteCB.visible = true;
else muteCB.visible = false;
if (data != null) this.moderator = data.moderator;
}
private function stripUseridFromUsername(uname:String):void {
var pattern:RegExp = /(\d*)-(\w*)$/;
var result:Object = pattern.exec(uname);
if (result != null) {
username = result[2];
}
}
private function handleEjectButtonClick():void {
//proxy.ejectUser(listenersList.selectedItem.userid);
var ejectCommand:ListenersCommand = new ListenersCommand(ListenersCommand.EJECT_USER);
@ -118,7 +103,7 @@
<mx:Button id="muteBtn" width="20" height="20" visible="true" enabled="{data.moderator}"
toolTip="{data.moderator ? ResourceUtil.getInstance().getString('bbb.listenerItem.muteUnmute.toolTip') : ''}"
icon="{data.muted ? muteIcon : unmuteIcon}" click="muteUser()"/>
<mx:Label id="nameLabel" textAlign="left" text="{username}" minWidth="120"
<mx:Label id="nameLabel" textAlign="left" text="{data.callerName}" minWidth="120"
toolTip="{ResourceUtil.getInstance().getString('bbb.listenerItem.nameLbl.toolTip')}"/>
<mx:Button id="muteCB" width="20" height="20" visible="true" enabled="{data.moderator}"
toolTip="{ResourceUtil.getInstance().getString('bbb.listenerItem.lockImg.toolTip')}"