Deleted CharChatRoomsList class and unified "views" namespace when possible.
This commit is contained in:
Ghaz Triki
parent
89ef6ed24e
commit
1f41c31997
@ -2,7 +2,7 @@
|
||||
<s:ItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009"
|
||||
xmlns:s="library://ns.adobe.com/flex/spark"
|
||||
xmlns:mx="library://ns.adobe.com/flex/mx"
|
||||
xmlns:participanticon="org.bigbluebutton.air.common.views.*">
|
||||
xmlns:views="org.bigbluebutton.air.common.views.*">
|
||||
|
||||
<fx:Script>
|
||||
<![CDATA[
|
||||
@ -76,7 +76,7 @@
|
||||
<s:Spacer height="{nameTimeGroup.height}"
|
||||
id="messageSpacer" />
|
||||
<s:HGroup width="100%">
|
||||
<participanticon:ParticipantIcon id="participantIcon"
|
||||
<views:ParticipantIcon id="participantIcon"
|
||||
height="100%" />
|
||||
<s:VGroup width="100%">
|
||||
<s:Spacer height="10%" />
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<s:ItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009"
|
||||
xmlns:s="library://ns.adobe.com/flex/spark"
|
||||
xmlns:mx="library://ns.adobe.com/flex/mx"
|
||||
xmlns:participanticon="org.bigbluebutton.air.common.views.*"
|
||||
xmlns:views="org.bigbluebutton.air.common.views.*"
|
||||
styleName="chatRoomItemStyle">
|
||||
|
||||
<fx:Script>
|
||||
@ -62,7 +62,7 @@
|
||||
visible="false"
|
||||
includeInLayout="false"
|
||||
styleName="iconStyle publicChatIconStyle" />
|
||||
<participanticon:ParticipantIcon id="participantIcon"
|
||||
<views:ParticipantIcon id="participantIcon"
|
||||
visible="false"
|
||||
includeInLayout="false" />
|
||||
<s:Label id="title"
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<s:List xmlns:fx="http://ns.adobe.com/mxml/2009"
|
||||
xmlns:s="library://ns.adobe.com/flex/spark"
|
||||
itemRenderer="org.bigbluebutton.air.chat.views.chatrooms.ChatRoomsItemRenderer"
|
||||
verticalScrollPolicy="off">
|
||||
<fx:Declarations>
|
||||
<!-- Place non-visual elements (e.g., services, value objects) here -->
|
||||
</fx:Declarations>
|
||||
<s:layout>
|
||||
<s:VerticalLayout horizontalAlign="contentJustify"
|
||||
requestedRowCount="-1" />
|
||||
</s:layout>
|
||||
</s:List>
|
||||
@ -11,7 +11,6 @@ package org.bigbluebutton.air.main.views.loginpage {
|
||||
import org.bigbluebutton.lib.common.models.ISaveData;
|
||||
import org.bigbluebutton.lib.main.commands.JoinMeetingSignal;
|
||||
import org.bigbluebutton.lib.main.models.IUserSession;
|
||||
import org.bigbluebutton.lib.main.services.ILoginService;
|
||||
|
||||
import robotlegs.bender.bundles.mvcs.Mediator;
|
||||
|
||||
@ -24,9 +23,6 @@ package org.bigbluebutton.air.main.views.loginpage {
|
||||
[Inject]
|
||||
public var joinMeetingSignal:JoinMeetingSignal;
|
||||
|
||||
[Inject]
|
||||
public var loginService:ILoginService;
|
||||
|
||||
[Inject]
|
||||
public var userSession:IUserSession;
|
||||
|
||||
@ -38,12 +34,12 @@ package org.bigbluebutton.air.main.views.loginpage {
|
||||
|
||||
override public function initialize():void {
|
||||
//loginService.unsuccessJoinedSignal.add(onUnsuccess);
|
||||
userUISession.joinFailureSignal.add(onUnsuccess);
|
||||
userUISession.joinFailureSignal.add(onFailure);
|
||||
view.tryAgainButton.addEventListener(MouseEvent.CLICK, tryAgain);
|
||||
joinRoom(userSession.joinUrl);
|
||||
}
|
||||
|
||||
private function onUnsuccess(reason:String):void {
|
||||
private function onFailure(reason:String):void {
|
||||
trace(LOG + "onUnsuccess() " + reason);
|
||||
FlexGlobals.topLevelApplication.topActionBar.visible = false;
|
||||
FlexGlobals.topLevelApplication.bottomMenu.visible = false;
|
||||
@ -84,7 +80,6 @@ package org.bigbluebutton.air.main.views.loginpage {
|
||||
public function joinRoom(url:String):void {
|
||||
if (Capabilities.isDebugger) {
|
||||
//saveData.save("rooms", null);
|
||||
// test-install server no longer works with 0.9 mobile client
|
||||
url = "bigbluebutton://test-install.blindsidenetworks.com/bigbluebutton/api/join?fullName=AIR&meetingID=Demo+Meeting&password=mp&redirect=false&checksum=3fdf56e9915c1031c3ea012b4ec8823cedd7c272";
|
||||
}
|
||||
if (!url) {
|
||||
@ -107,8 +102,8 @@ package org.bigbluebutton.air.main.views.loginpage {
|
||||
|
||||
override public function destroy():void {
|
||||
super.destroy();
|
||||
//loginService.unsuccessJoinedSignal.remove(onUnsuccess);
|
||||
userUISession.joinFailureSignal.remove(onUnsuccess);
|
||||
//loginService.unsuccessJoinedSignal.remove(onFailure);
|
||||
userUISession.joinFailureSignal.remove(onFailure);
|
||||
view.dispose();
|
||||
view = null;
|
||||
}
|
||||
|
||||
@ -2,12 +2,10 @@
|
||||
<s:ItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009"
|
||||
xmlns:s="library://ns.adobe.com/flex/spark"
|
||||
xmlns:mx="library://ns.adobe.com/flex/mx"
|
||||
xmlns:selection="org.bigbluebutton.air.common.views.*"
|
||||
xmlns:participanticon="org.bigbluebutton.air.common.views.*"
|
||||
xmlns:views="org.bigbluebutton.air.common.views.*"
|
||||
styleName="streamItemStyle"
|
||||
dataChange="onDataChange(event)"
|
||||
height="100%"
|
||||
xmlns:views="org.bigbluebutton.air.common.views.*">
|
||||
height="100%">
|
||||
<s:states>
|
||||
<s:State name="normal" />
|
||||
<s:State name="selected" />
|
||||
@ -62,7 +60,7 @@
|
||||
paddingBottom="{getStyle('paddingBottom')}" />
|
||||
</s:layout>
|
||||
|
||||
<participanticon:ParticipantIcon width="10%"
|
||||
<views:ParticipantIcon width="10%"
|
||||
id="participantIcon" />
|
||||
|
||||
<s:VGroup width="100%"
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<s:ItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009"
|
||||
xmlns:s="library://ns.adobe.com/flex/spark"
|
||||
xmlns:mx="library://ns.adobe.com/flex/mx"
|
||||
xmlns:participanticon="org.bigbluebutton.air.common.views.*"
|
||||
xmlns:views="org.bigbluebutton.air.common.views.*"
|
||||
styleName="participantItemStyle">
|
||||
|
||||
<fx:Script>
|
||||
@ -50,7 +50,7 @@
|
||||
paddingRight="{getStyle('itemPaddingRight')}" />
|
||||
</s:layout>
|
||||
|
||||
<participanticon:ParticipantIcon id="participantIcon" />
|
||||
<views:ParticipantIcon id="participantIcon" />
|
||||
|
||||
<s:Group width="100%">
|
||||
<s:layout>
|
||||
|
||||
@ -5,8 +5,13 @@
|
||||
xmlns:participants="org.bigbluebutton.air.users.views.participants.*"
|
||||
xmlns:guests="org.bigbluebutton.air.users.views.participants.guests.*"
|
||||
xmlns:common="org.bigbluebutton.air.common.views.*"
|
||||
xmlns:chatrooms="org.bigbluebutton.air.chat.views.chatrooms.*"
|
||||
styleName="participantsViewStyle">
|
||||
|
||||
<fx:Script>
|
||||
<![CDATA[
|
||||
import org.bigbluebutton.air.chat.views.chatrooms.ChatRoomsItemRenderer;
|
||||
]]>
|
||||
</fx:Script>
|
||||
<s:Scroller width="100%"
|
||||
height="100%">
|
||||
<s:Group width="100%"
|
||||
@ -32,8 +37,16 @@
|
||||
</s:HGroup>
|
||||
</s:Group>
|
||||
|
||||
<chatrooms:ChatRoomsList id="conversationslist"
|
||||
width="100%" />
|
||||
<s:List id="conversationslist"
|
||||
width="100%"
|
||||
itemRenderer="org.bigbluebutton.air.chat.views.chatrooms.ChatRoomsItemRenderer"
|
||||
verticalScrollPolicy="off">
|
||||
<s:layout>
|
||||
<s:VerticalLayout horizontalAlign="contentJustify"
|
||||
requestedRowCount="-1" />
|
||||
</s:layout>
|
||||
</s:List>
|
||||
|
||||
<s:Group width="100%"
|
||||
height="{getStyle('itemHeight')}">
|
||||
<s:Rect width="100%"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user