Author: sebawagner
Date: Fri Feb 3 13:29:46 2012
New Revision: 1240154
URL: http://svn.apache.org/viewvc?rev=1240154&view=rev
Log:
OPENMEETINGS-40 Merge Audio/Video components to trunk
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/labelCheckbox.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/resources/messagebox_warning.png
(with props)
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/functions.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/REMOVE_videoContainer.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/REMOVE_videoInfoStuff.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/maindebug.as3.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/text/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/hibernate/hibRtmpConnection.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/hibernate/netRemoteCallHib.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/mainAttributes.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/mainMethods.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/remote/rtmpConnection.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/hibAdapter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/maindebug.as3.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/maindebug.as3.lzx?rev=1240154&r1=1240153&r2=1240154&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/maindebug.as3.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/maindebug.as3.lzx
Fri Feb 3 13:29:46 2012
@@ -75,29 +75,4 @@
<view name="inner"></view>
- <!--<commonVideoViewContent name="_videoComponent"/>-->
- <!--<hibAdapter/>-->
-
- <!--<view x="${canvas.width/2}" width="100" height="20" bgcolor="0xFF0000"
opacity="0.5">-->
- <!--<passthrough when="$as3">-->
- <!--import flash.net.*;-->
- <!--import flash.display.*;-->
- <!--</passthrough>-->
- <!--<text>Test SWF10</text>-->
- <!--<handler name="onclick">-->
- <!--var dragHelper = new lz.view(canvas,
{name:'dragHelper',width:canvas.width,height:canvas.height,x:'0',y:'0',bgcolor:'0xAAAAFF',
opacity:0.5});-->
- <!--dragHelper.bringToFront();-->
- <!--</handler>-->
- <!--</view>-->
-
-
-
- <!--<view name="debug" width="800" height="300"
onmousedown="dragger.setAttribute('applied', true)"
onmouseup="dragger.setAttribute('applied', false)" bgcolor="0x555555">-->
- <!--<dragstate name="dragger"/>-->
- <!--<text name="console" multiline="true" y="20" bgcolor="0xAAAAAA"
width="100%"></text>-->
- <!--<method name="write" args="text">-->
- <!--this.console.setAttribute('text', this.console.getText() +
'\n' + text);-->
- <!--</method>-->
- <!--</view>-->
-
</canvas>
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/labelCheckbox.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/labelCheckbox.lzx?rev=1240154&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/labelCheckbox.lzx
(added)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/labelCheckbox.lzx
Fri Feb 3 13:29:46 2012
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<library>
+
+<class name="labelCheckbox" extends="checkbox" style="componentStyle"
fontsize="11" >
+ <attribute name="labelid" type="number" setter="setLabelId(labelid)" />
+ <method name="setLabelId" args="_labelid" >
+ this.labelid = _labelid;
+ this.setAttribute('text',canvas.getLabelName(this.labelid));
+ </method>
+</class>
+
+</library>
\ No newline at end of file
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/library.lzx?rev=1240154&r1=1240153&r2=1240154&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/library.lzx
Fri Feb 3 13:29:46 2012
@@ -3,6 +3,7 @@
<include href="resetCombobox.lzx" />
<include href="miniIconsPresenter.lzx" />
+ <include href="labelCheckbox.lzx" />
<include href="text/" />
<include href="button/" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/text/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/text/library.lzx?rev=1240154&r1=1240153&r2=1240154&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/text/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/text/library.lzx
Fri Feb 3 13:29:46 2012
@@ -5,8 +5,10 @@
<include href="borderedInputtext.lzx" />
<include href="labelText.lzx" />
<include href="labelTooltip.lzx" />
+ <!--
<include href="customEdittext.lzx" />
<include href="customscrollEdittext.lzx" />
<include href="customInputtext.lzx" />
+ -->
</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/hibernate/hibRtmpConnection.lzx?rev=1240154&r1=1240153&r2=1240154&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/hibernate/hibRtmpConnection.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/hibernate/hibRtmpConnection.lzx
Fri Feb 3 13:29:46 2012
@@ -26,67 +26,8 @@
</method>
</class>
-<class name="hibRtmpConnection" extends="rtmpConnection" debug="false"
- src="$once{
this.protocollName+'://'+canvas.rtmphostlocal+':'+this.protocollPort+'/'+canvas.webAppRootKey+'/'+this.userScope
}" >
+<class name="hibRtmpConnection" extends="rtmpConnection" debug="false" src="" >
- <attribute name="protocollName" type="string" value="rtmp" />
- <attribute name="protocollPort" type="string" value="$once{
canvas.rtmpport }" />
- <attribute name="counterror" type="number" value="0" />
-
- <attribute name="loaderVar" value="null" />
-
- <attribute name="userScope" value="hibernate" type="string" />
-
- <!-- refreshing the session regulary -->
- <attribute name="refreshDelegate" value="null" />
-
- <!-- UserId-->
- <attribute name="UserID" value="1" type="number" />
- <!-- reconnect after each conferenceView -->
- <attribute name="reconnectAfterRoomleft" type="boolean" value="false" />
- <attribute name="reconnectedRoomInstance" value="null" />
-
- <attribute name="reconnectionAction" value="false" type="boolean" />
- <attribute name="reconnectObjRef" value="null" />
-
- <attribute name="userobject" value="null" />
-
- <!-- default will be loaded on startup -->
- <attribute name="userlang" value="1" type="number" />
-
- <!-- The default Language will be loaded on init -->
- <attribute name="initlanguageLoaded" value="false" type="boolean" />
-
- <!-- This domain is the orgdomain used in the video-conference -->
- <attribute name="conferencedomain" value="public" type="string" />
-
- <!-- if this connection is used for testing the app
- see test-setup.lzx -->
- <attribute name="testAppLoading" value="false" type="boolean" />
-
- <!--
- the real ROOM_ID
- -->
- <attribute name="currentroomid" value="0" type="number" />
-
- <!-- This is the current domain the user has logged-in -->
- <attribute name="currentdomain" value="domain1" type="string" />
- <attribute name="currentdomainObj" value="domain1" type="string" />
-
- <!--- the current Invitation-Object -->
- <attribute name="currentInvitation" value="null" />
-
- <!-- shows what kind of conferenceView it is at the moment
- wether its conferenceView or audienceView -->
- <attribute name="modus" value="" type="string" />
-
- <!-- shows what kind of room the use is public or private -->
- <attribute name="roomtype" value="" type="string" />
-
- <attribute name="showKickMessage" value="false" type="boolean"/>
- <attribute name="showFullMessage" value="false" type="boolean"/>
-
-
<!--
The onconnect Method is triggered several times:
- When you enter a room the NetConnection will close and
reconnect to the Scope of the Room
@@ -94,7 +35,7 @@
-->
<handler name="onconnect">
if($debug) Debug.write("hibRtmpConnection/onconnect");
- this.overwritePublicSID.doCall();
+ // this.overwritePublicSID.doCall();
//this.setUsernameReconnect.doCall();
</handler>
@@ -106,8 +47,9 @@
</handler>
</netRemoteCallHib>
- <handler name="onerror" >
- this.connect();
+ <handler name="onerror" args="value">
+ if ($debug) Debug.write("Connection error ",value);
+ // this.connect();
</handler>
</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/hibernate/netRemoteCallHib.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/hibernate/netRemoteCallHib.lzx?rev=1240154&r1=1240153&r2=1240154&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/hibernate/netRemoteCallHib.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/hibernate/netRemoteCallHib.lzx
Fri Feb 3 13:29:46 2012
@@ -50,14 +50,13 @@
if (this.activeErrorHandler) {
if (Number(value)<0){
- Debug.warn("Received Error ID: ",value);
+ if ($debug) Debug.warn("Received Error ID: ",value);
if (this.isCallBackHandler)
{
- var dlg = new
lz.callbackRpcErrorDialog(canvas,{callBackObject:this,errorid:Number(value)});
- lz.Focus.setFocus(dlg);
+ //TODO: Fix error messages
+
} else {
- var dlg = new
lz.rpcErrorDialog(canvas,{errorid:Number(value)});
- lz.Focus.setFocus(dlg);
+ //TODO: Fix error messages
}
}
}
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/library.lzx?rev=1240154&r1=1240153&r2=1240154&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/library.lzx
Fri Feb 3 13:29:46 2012
@@ -4,28 +4,9 @@
<include href="remote/" />
<include href="components/" />
<include href="hibernate/" />
- <!--<include href="contentviews/" />-->
- <!--<include href="usermanage/" />-->
- <!--<include href="navi/" />-->
-<!---->
- <!--<include href="auth/" />-->
-<!-- Not Used ? 2008.3.21 Kuze
- <include href="tabbar/" />
--->
- <!-- for main.lzx -->
- <!--<include href="externalJavaScript.lzx" />-->
- <include href="functions.lzx" />
- <!--<include href="sipfunctions.lzx" /> -->
<include href="mainAttributes.lzx" />
<include href="mainDatasets.lzx" />
<include href="mainMethods.lzx" />
- <!--<include href="logoutConfirm.lzx" />-->
- <!--
- Defines the Core Classes that gets loaded in the Main Navigation
- -->
- <!--<include href="moduleConfiguration.lzx" />-->
-
-
</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/mainAttributes.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/mainAttributes.lzx?rev=1240154&r1=1240153&r2=1240154&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/mainAttributes.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/mainAttributes.lzx
Fri Feb 3 13:29:46 2012
@@ -3,42 +3,6 @@
<!-- all attributes for main.lzx -->
<library>
-<!--
-##########################################################
-these properties will be overwritten by config.xml -->
-
-<!--- URL/IP to use for the Server 192.168.178.28
- inno02.fh-pforzheim.de macbook 192.168.2.103
- 192.168.2.102 bxlug.homelinux.org 213.219.160.72
- if this value is empty it will try to connect to the
- domain-name it has been loading from
- -->
-<attribute name="rtmphostlocal" value="" type="string" />
-
-<!---
- Port to use for the Server
- To this port the default server lookup is done
-
- You can find all this configuraiton in your red5-Config in:
$RED5_HOME/conf/red5.properties
- -->
-<attribute name="rtmpport" value="1935" type="string" />
-
-<!---
- Port to use for the Server
- To this port the fallback is done once the default rtmport failed
- this should workaround 99% of all firewalls
- -->
-<attribute name="rtmpTunnelport" value="8088" type="string" />
-
-<!---
- Port to use for the Server
- This port is used to connec to the http-servlet
- of the red5-servlet
- -->
-<attribute name="red5httpport" value="5080" type="string" />
-
-<attribute name="useSSL" value="false" type="boolean" />
-<attribute name="rtmpsslport" value="443" type="string" />
<!---
These colors are the main colors and style the hole application
@@ -47,142 +11,6 @@ these properties will be overwritten by
<attribute name="baseMousecolorizer" value="0xC4D5E6" type="string" />
<attribute name="baseMouseOvercolorizer" value="0xC4D5E6" type="string" />
-<attribute name="bgColorMenu" value="0xEEF0EB" type="string" />
-<attribute name="fontColorHeader" value="0x000000" type="string" />
-<attribute name="bgColorMenuItems" value="0xEAEAEA" type="string" />
-
-<attribute name="webAppRootKey" value="" type="string" />
-
-<attribute name="httpRootKey" value="/" type="string" />
-
-<attribute name="showAudioVideoTest" value="true" type="boolean" />
-
-<!--
- Id of the Recording that is played when access the Recordings Player
via Direct Link URL
- -->
-<attribute name="roomRecordingId" value="0" type="number" />
-
-<!--- Name of the Application -->
-<attribute name="currentappname" value="OpenMeetings" type="string" />
-<attribute name="currentappnameurl" value="OpenMeetings" type="string" />
-<attribute name="currentappnamebugurl" value="OpenMeetings" type="string" />
-
-<!--- Video Settings -->
-<attribute name="loudnessAcitviation" value="10" type="number" />
-<attribute name="showWindowEffect" value="y" type="string" />
-
-<!--- Calendar Settings -->
-<attribute name="firstdayinweek" value="1" type="number" />
-
-<attribute name="showmodernWhiteBoard" value="y" type="string" />
-
-<attribute name="showRecording" value="visible" type="string" />
-
-<attribute name="defaultWhiteboardWidth" value="2400" type="number" />
-<attribute name="defaultWhiteboardHeight" value="1200" type="number" />
-
-<!-- END OF config.xml attributes
-##########################################################
- -->
-
-<attribute name="userHistory" value="null" />
-<attribute name="browserTabHistory" value="null" />
-
-<!-- this attribute holds an object of type RoomClient
- the LAST RoomClient Object that has been changed the drawstatus
- so ondrawAllowStatus = will trigger that the draw-status of ANYBODY has
changed
- and canvas.drawAllowStatus = is the RoomClient that has changed
- and canvas.drawAllowStatus.canDraw = is the new Status of that RoomClient
- -->
-
-<attribute name="drawAllowStatus" value="null"/>
-
-<!--
- this value indicates if this user is allowed to draw to the Whiteboard
- If this user is currently Moderator => he ALWAYS can draw to whiteboard
- even if this isAllowedToDraw == false
- -->
-<attribute name="isAllowedToDraw" value="false" type="boolean" />
-
-<!--- URL/IP to use for the Server -->
-<attribute name="rtmphost" value="" type="string" />
-
-<!--- Username/Nickname -->
-<attribute name="currentuser" value="" type="string" />
-
-<!--- Roomname internaly Scope -->
-<attribute name="currentcourse" value="" type="string" />
-
-<!--- Roomname/Coursename -->
-<attribute name="currentcourseName" value="" type="string" />
-
-<attribute name="currentImagesListdraw" value="null" />
-
-<!---
- The Reference for a Streaming Object
- This should be removed later when the OpenLaszlo API handles
- the broadcast better
- -swagner
- -->
-<attribute name="_nc" value="null" />
-
-<attribute name="vaquality" value="best" type="string" />
-
-<!--
-<attribute name="moderatorStreamID" value="" type="string" />
-<attribute name="moderatorationObject" value="" type="string" />
-<attribute name="moderatorName" type="string"
setter="this.setModeratorName(moderatorName)" />
- -->
-<attribute name="currentModeratorList" value="null" />
-
-<attribute name="newModeratorList" value="null" />
-<attribute name="removeModeratorList" value="null" />
-
-<attribute name="ismoderator" value="false" type="boolean" />
-
-<attribute name="loadingmessage" value="" type="string" />
-<!---
- The state of the Application
- At the beginning you should choose how many users are allowed to
- login simultaniously
- -->
-<attribute name="islogedin" value="false" type="boolean" />
-
-<attribute name="htmlframeisloaded" value="false" type="boolean" />
-<attribute name="createIFrameDone_attr" value="false" type="boolean" />
-
-
-<attribute name="uploadmoduleppt" value="videoconf1ppt" type="string" />
-<attribute name="uploadmoduleimg" value="videoconf1" type="string" />
-<attribute name="foldersequence" value="null" />
-<attribute name="uploadmoduleimgfolder" value="" type="string" />
-<!---
- Can be either 2 or 4
- But theoretically there is no limit
- -->
-<attribute name="numberofallowedpartners" value="0" type="number" />
-
-<!--- Number of currently connected Users -->
-<attribute name="numberofpartners" value="0" type="number" />
-
-<!--- unique ID of this Stream -->
-<attribute name="streamid" value="0" type="string" />
-
-<!--- id of the current Mod in this room -->
-<attribute name="currentmodid" value="0" type="string" />
-
-<attribute name="currentlanguage" value="english" type="string" />
-
-<attribute name="objWhiteboard" value="null" />
-<attribute name="objMessage" value="null" />
-<attribute name="VarsModeratorGeneral" value="null" />
-
-<attribute name="isConference" value="false" type="boolean" />
-
-<attribute name="statesInitValues" value="null" />
-<attribute name="salutationsInitValues" value="null" />
-<attribute name="roomTypesInitValues" value="null" />
-
<!--- Audio-Video Quality Settings
overwritten by values from the config.xml
-->
@@ -194,186 +22,20 @@ these properties will be overwritten by
<attribute name="microphoneRateNormal" value="22" type="number" />
<attribute name="microphoneRateBest" value="44" type="number" />
-<!--- Reference to the current active drawarea -->
-<attribute name="_drawarea" value="null" />
-
-<!--- Username of current user -->
-<attribute name="currentusename" value="defaultname" type="string" />
-<attribute name="user_id" value="0" type="number" />
-<attribute name="firstName" value="" type="string" />
-<attribute name="timeZoneId" value="0" type="number" />
-<attribute name="jNameTimeZone" value="" type="string" />
-<attribute name="lastName" value="" type="string" />
-<attribute name="mail" value="" type="string" />
-<attribute name="lastLogin" value="" type="string" />
-<attribute name="official_code" value="" type="string" />
-<attribute name="picture_uri" value="" type="string" />
-<attribute name="language" value="" type="string" />
-
-<!--- User porperties -->
-<attribute name="currentusercolor" value="0" type="number" />
-<attribute name="currentuserpos" value="0" type="number" />
-
-<attribute name="currentModApply" value="null" />
-
-<attribute name="sessionObject" value="null" />
-<attribute name="sessionId" value="" type="string" />
-
-<attribute name="syncWindow" value="null" />
-<attribute name="syncImageWindow" value="null" />
-<attribute name="syncSWFWindow" value="null" />
-<attribute name="publicSID" value="" type="string" />
-
-<!--- attributes for direct room access -->
-<attribute name="initroomid" value="0" type="number" />
-<attribute name="initroomStr" value="" type="string" />
-<attribute name="initroomtype" value="" type="string" />
-<attribute name="initdomainid" value="" type="string" />
-<attribute name="initlangid" value="1" type="number" />
-<attribute name="isinitRoomDirect" value="false" type="boolean" />
-<attribute name="isinitRoomObject" value="null" />
-
-<!-- attributes for direct room access via direct link -->
-<attribute name="directUserLogin" value="false" type="boolean" />
-<attribute name="directRoomId" value="1" type="number" />
-<attribute name="directRoomObj" value="null" />
-
-<!--- attributes for direct room access via remoteUser -->
-<attribute name="remoteUserLogin" value="false" type="boolean" />
-<attribute name="remoteUserSid" value="" type="string" />
-
-<!--- attributes for direct room access via remoteUser
- This is using the advanced methods to prevent abuse
- -->
-<attribute name="secureRemoteUserLogin" value="false" type="boolean" />
-<attribute name="secureHash" value="" type="string" />
-
-<!--- skip loading of Language -->
-<attribute name="language_id" value="0" type="number" />
-
-<attribute name="isResetUsername" value="false" type="boolean" />
-<attribute name="resetHash" value="" type="string" />
-
-<attribute name="naviHeight" value="110" type="number" />
-<attribute name="naviHeightDelta" value="110" type="number" />
-
-<attribute name="currentrecorder" value="null" />
-<attribute name="currentrecorder_id" value="0" type="number" />
<!---
-Holds a refernce to the current VideoCOntainer Object
+Holds a reference to the current VideoCOntainer Object
containing the VideoViews
and some more references to temp-objects
-->
<attribute name="_videocontainer" value="null" />
-<attribute name="_mymod" value="null" />
-
-<attribute name="isrtl" value="false" type="boolean" />
-
-<!---
- Attributes for browser panel size.
- Those attributes are used to determine size of browser class
(modules/conference/browser/conferenecBrowser.lzx)
- in base/mainMethods.lzx.
- 2008 Apr 9 commented by [email protected]
--->
-<attribute name="browserPanelWidth" value="600"/>
-<attribute name="browserPanelHeight" value="500"/>
-
-<attribute name="currentSlideNo" value="0" type="number" />
-<attribute name="currentSlideTotal" value="0" type="number" />
-<attribute name="currentSlideZoom" value="0" type="number" />
-
-<attribute name="currentUploadWindow" value="null" />
-
-<!--
- ################################
- Attributes for direct Moderator setup via Moodle
- -->
-<attribute name="isMoodleRoom" value="false" type="boolean" />
-
-<attribute name="becomemoderator" value="false" type="boolean" />
-<attribute name="becomeSuperModerator" value="false" type="boolean" />
-
-<attribute name="moodleWwwRoot" value="" type="string" />
-<attribute name="moodleUserId" value="0" type="number" />
-<attribute name="moodlePicture" value="0" type="number" />
-
-
-<attribute name="currentRoomObj" value="null" />
-<attribute name="refreshSession" value="60000" type="number" />
-
-<attribute name="globalFontSize" value="11" type="number" />
-
-<attribute name="lastBroadCastingUser" value="null" />
-
-<attribute name="isBroadCasting" value="false" type="boolean" />
-
-<attribute name="currentContentView" value="null" />
-
-<!-- item to focus on after rpcErrorDialog has been shown-->
-<attribute name="focusOnItem" value="null"/>
+<attribute name="currentNC" value="null" />
<attribute name="currentRoomObject" value="null"/>
-<attribute name="screenSharingDialogContainer" value="null"/>
-
-<attribute name="conferenceBrowserIsinited" value="false" type="boolean" />
-
-<attribute name="isAllowedToScreenShare" value="false" type="boolean" />
-
-<attribute name="isAllowedToRemoteControl" value="false" type="boolean" />
-
-<attribute name="lzCalendarInfoTab" value="null"/>
-
-<attribute name="roomJumpId" value="0" type="number" />
-
-<attribute name="userContacts" value="null" />
-
-<!--
- Loads a User profile page directly instead of loading the Dashboard
- cuser is a hash that can be found in the UserContacts Table
- -->
-<attribute name="cuser" value="" type="string"/>
-
-<!--
- Indicates if the user does accept or deny a user contact request
- -->
-<attribute name="cuserStatus" value="none" type="string"/>
-
-<!--
- Attributes to handle the click search on linked user-keywords
- -->
-<attribute name="userSettingsModuleOpt" value="userProfile" type="string"/>
-
-<attribute name="userSettingsSearchType" value="" type="string"/>
-<attribute name="userSettingsSearchPhrase" value="" type="string"/>
-<attribute name="userSettingsSearchRef" value="null"/>
-
-<!--
- Attribute to load a custom user calendar instead of the own one
--->
-<attribute name="contactUser" value="0" type="number" />
-
-<!--
- Used in SOAP API to indicate if the user will see a pop up to enter its
nickname
- -->
-<attribute name="showNickNameDialog" value="false" type="boolean" />
-
-<!--
- Used in SOAP API to indicate if the user logs directly into a room or into
the dashboard
- -->
-<attribute name="landingZone" value="" type="string"/>
-
-<!--
- if the users logs in via SOAP he does not see the exit button by default
- only if the landingZone == dashboard
- -->
-<attribute name="destroyExitButton" value="true" type="boolean" />
-
-<attribute name="currentFileExplorer" value="null"/>
-
-<attribute name="allowRecording" value="true" type="boolean" />
+<attribute name="webAppRootKey" value="" type="string" />
+<attribute name="httpRootKey" value="/" type="string" />
</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/mainMethods.lzx?rev=1240154&r1=1240153&r2=1240154&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/mainMethods.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/mainMethods.lzx
Fri Feb 3 13:29:46 2012
@@ -11,35 +11,12 @@
if($debug) Debug.write("main.lzx/config.xml ondata",this);
- //Set Config-values by config.xml, see comments on config.xml
-
this.setAttribute('rtmphostlocal',canvas.myConfigSet.getPointer().xpathQuery('config/rtmphostlocal/text()'));
-
this.setAttribute('rtmpport',Number(canvas.myConfigSet.getPointer().xpathQuery('config/rtmpport/text()')));
-
this.setAttribute('rtmpTunnelport',Number(canvas.myConfigSet.getPointer().xpathQuery('config/rtmpTunnelport/text()')));
-
this.setAttribute('rtmpsslport',Number(canvas.myConfigSet.getPointer().xpathQuery('config/rtmpsslport/text()')));
-
- var userSSLString =
canvas.myConfigSet.getPointer().xpathQuery('config/useSSL/text()');
- if ($debug) Debug.write("userSSLString",userSSLString)
- if (userSSLString == "yes") {
- this.setAttribute('useSSL',true);
- }
-
-
this.setAttribute('red5httpport',Number(canvas.myConfigSet.getPointer().xpathQuery('config/red5httpport/text()')));
this.setAttribute('basebgcolorizer',canvas.myConfigSet.getPointer().xpathQuery('config/basebgcolorizer/text()'));
this.setAttribute('baseMousecolorizer',canvas.myConfigSet.getPointer().xpathQuery('config/baseMousecolorizer/text()'));
this.setAttribute('baseMouseOvercolorizer',canvas.myConfigSet.getPointer().xpathQuery('config/baseMouseOvercolorizer/text()'));
-
this.setAttribute('currentappname',canvas.myConfigSet.getPointer().xpathQuery('config/currentappname/text()'));
-
this.setAttribute('currentappnameurl',canvas.myConfigSet.getPointer().xpathQuery('config/currentappnameurl/text()'));
-
this.setAttribute('currentappnamebugurl',canvas.myConfigSet.getPointer().xpathQuery('config/currentappnamebugurl/text()'));
-
this.setAttribute('loudnessAcitviation',canvas.myConfigSet.getPointer().xpathQuery('config/loudnessAcitviation/text()'));
-
this.setAttribute('webAppRootKey',canvas.myConfigSet.getPointer().xpathQuery('config/webAppRootKey/text()'));
-
this.setAttribute('showWindowEffect',canvas.myConfigSet.getPointer().xpathQuery('config/showWindowEffect/text()'));
-
this.setAttribute('firstdayinweek',canvas.myConfigSet.getPointer().xpathQuery('config/firstdayinweek/text()'));
-
this.setAttribute('showRecording',canvas.myConfigSet.getPointer().xpathQuery('config/showRecording/text()'));
-
- //old menubar is not active anymore
-
//this.setAttribute('showmodernWhiteBoard',canvas.myConfigSet.getPointer().xpathQuery('config/showmodernWhiteBoard/text()'));
//Audio-Video-Settings
+
this.setAttribute('loudnessAcitviation',canvas.myConfigSet.getPointer().xpathQuery('config/loudnessAcitviation/text()'));
this.setAttribute('framesPerSecond',Number(canvas.myConfigSet.getPointer().xpathQuery('config/framesPerSecond/text()')));
this.setAttribute('bandwidthNeededNormal',Number(canvas.myConfigSet.getPointer().xpathQuery('config/bandwidthNeededNormal/text()')));
this.setAttribute('bandwidthNeededBest',Number(canvas.myConfigSet.getPointer().xpathQuery('config/bandwidthNeededBest/text()')));
@@ -48,189 +25,11 @@
this.setAttribute('microphoneRateNormal',Number(canvas.myConfigSet.getPointer().xpathQuery('config/microphoneRateNormal/text()')));
this.setAttribute('microphoneRateBest',Number(canvas.myConfigSet.getPointer().xpathQuery('config/microphoneRateBest/text()')));
-
this.setAttribute('defaultWhiteboardWidth',Number(canvas.myConfigSet.getPointer().xpathQuery('config/defaultWhiteboardWidth/text()')));
-
this.setAttribute('defaultWhiteboardHeight',Number(canvas.myConfigSet.getPointer().xpathQuery('config/defaultWhiteboardHeight/text()')));
-
-
-
this.setAttribute('adminModuleUser',canvas.myConfigSet.getPointer().xpathQuery('config/adminModuleUser/text()'));
-
this.setAttribute('adminModuleRoom',canvas.myConfigSet.getPointer().xpathQuery('config/adminModuleRoom/text()'));
-
this.setAttribute('adminModuleOrg',canvas.myConfigSet.getPointer().xpathQuery('config/adminModuleOrg/text()'));
-
this.setAttribute('adminModuleLanguages',canvas.myConfigSet.getPointer().xpathQuery('config/adminModuleLanguages/text()'));
-
this.setAttribute('adminModuleConnections',canvas.myConfigSet.getPointer().xpathQuery('config/adminModuleConnections/text()'));
-
this.setAttribute('adminModuleConfiguration',canvas.myConfigSet.getPointer().xpathQuery('config/adminModuleConfiguration/text()'));
-
this.setAttribute('adminModuleBackup',canvas.myConfigSet.getPointer().xpathQuery('config/adminModuleBackup/text()'));
-
-
this.setAttribute('moderatorModuleUser',canvas.myConfigSet.getPointer().xpathQuery('config/moderatorModuleUser/text()'));
-
this.setAttribute('moderatorModuleRoom',canvas.myConfigSet.getPointer().xpathQuery('config/moderatorModuleRoom/text()'));
-
-
this.setAttribute('dashboardModuleStartScreen',canvas.myConfigSet.getPointer().xpathQuery('config/dashboardModuleStartScreen/text()'));
-
this.setAttribute('dashboardModuleCalendar',canvas.myConfigSet.getPointer().xpathQuery('config/dashboardModuleCalendar/text()'));
-
-
this.setAttribute('conferenceModuleRoomList',canvas.myConfigSet.getPointer().xpathQuery('config/conferenceModuleRoomList/text()'));
-
this.setAttribute('conferenceRoomModule',canvas.myConfigSet.getPointer().xpathQuery('config/conferenceRoomModule/text()'));
-
-
this.setAttribute('eventModuleRoomList',canvas.myConfigSet.getPointer().xpathQuery('config/eventModuleRoomList/text()'));
-
this.setAttribute('eventRoomModule',canvas.myConfigSet.getPointer().xpathQuery('config/eventRoomModule/text()'));
-
-
this.setAttribute('restrictedRoomModule',canvas.myConfigSet.getPointer().xpathQuery('config/restrictedRoomModule/text()'));
-
-
this.setAttribute('interviewRoomModule',canvas.myConfigSet.getPointer().xpathQuery('config/interviewRoomModule/text()'));
-
-
-
this.setAttribute('userSettingsModule',canvas.myConfigSet.getPointer().xpathQuery('config/userSettingsModule/text()'));
-
-
this.setAttribute('recordModule',canvas.myConfigSet.getPointer().xpathQuery('config/recordModule/text()'));
-
this.setAttribute('httpRootKey',canvas.myConfigSet.getPointer().xpathQuery('config/httpRootKey/text()'));
-
- //mainBaseText.setAttribute('text',canvas.currentappname);
- //mainBaseText.setShadow();
- //mainBaseTextLabel.setAttribute('text',canvas.currentappnameurl);
-
-
var _url = this.getDisplayObject().loaderInfo.url;
if($debug) Debug.write("_url: ",_url);
-
- var cleanUrl = _url;
-
- var hasParams = _url.indexOf("?");
- if (hasParams != -1) {
- cleanUrl = _url.substr(0,hasParams-1);
- }
-
- if ($debug) Debug.write("_url ",_url,cleanUrl);
- var doubleSlash = cleanUrl.indexOf("//");
- var isNotPort80 = cleanUrl.indexOf(":", doubleSlash+2);
- if ($debug) Debug.write("isNotPort80: ",isNotPort80,doubleSlash);
- if (isNotPort80!=-1){
- //Debug.write("isNotPort80: ",doubleSlash+2, _url.indexOf(":",
doubleSlash+2)-doubleSlash-2);
- var server = cleanUrl.substr(doubleSlash+2, _url.indexOf(":",
doubleSlash+2)-doubleSlash-2);
- } else {
- var server = cleanUrl.substr(doubleSlash+2, _url.indexOf("/",
doubleSlash+2)-doubleSlash-2);
- }
-
- if ($debug) Debug.write("this zielnr: ",this,server);
-
- this.setAttribute('rtmphost',server);
-
- if (this.rtmphostlocal.length==0){
- this.setAttribute('rtmphostlocal',server);
- }
-
- //Check for Invitation
- var invitationHash = lz.Browser.getInitArg('invitationHash');
-
- if ($debug) Debug.info("###################### -1 ");
- if ($debug) Debug.info("invitationHash :: ",invitationHash);
-
- if (invitationHash != undefined){
- canvas.isinitRoomDirect = true;
- canvas.invitationHash = invitationHash;
- }
-
- var secureHash = lz.Browser.getInitArg('secureHash');
- if (secureHash != undefined){
- canvas.secureRemoteUserLogin = true;
- canvas.secureHash = secureHash;
- }
-
- if ($debug) Debug.info("###################### -2 ");
-
- //sid=fe9ea55284e0b23991b1c1089b2c8f64&roomid=1
- var sid = lz.Browser.getInitArg('sid');
- var initroomid = lz.Browser.getInitArg('roomid');
- if (sid != undefined && initroomid != undefined){
- canvas.remoteUserLogin = true;
- canvas.initroomid = initroomid;
- canvas.remoteUserSid = sid;
- }
-
- var directRoomId = lz.Browser.getInitArg('directRoomId');
- if (directRoomId != undefined) {
- canvas.directUserLogin = true;
- canvas.directRoomId = directRoomId;
- }
-
- var language = lz.Browser.getInitArg('language');
- if (language != undefined) {
- canvas.language_id = Number(language);
- }
-
- //check for reset password
- var hash = lz.Browser.getInitArg('hash');
- if (hash!=undefined){
- canvas.isResetUsername = true;
- canvas.resetHash = hash;
- }
-
- var cuserItem = lz.Browser.getInitArg('cuser');
- if (cuserItem!=undefined){
- canvas.cuser = cuserItem;
-
- //Lookup additional actions
- var tAccept = lz.Browser.getInitArg('tAccept');
- if (tAccept != undefined) {
- canvas.cuserStatus = tAccept;
- } else {
- canvas.cuserStatus = "none";
- }
-
- }
-
- var moodleRoom = lz.Browser.getInitArg('moodleRoom');
- var becomemoderator = lz.Browser.getInitArg('becomemoderator');
-
- if (becomemoderator != undefined) {
- if (becomemoderator == "2"){
- canvas.becomemoderator = true;
- } else {
- canvas.becomemoderator = false;
- }
- }
-
- if (moodleRoom != undefined){
- canvas.isMoodleRoom = true;
-
- var moodleWwwRoot = lz.Browser.getInitArg('wwwroot');
- var moodleUserId = lz.Browser.getInitArg('user_id');
- var moodlePicture = lz.Browser.getInitArg('picture');
-
- if (moodleWwwRoot != undefined) {
- canvas.moodleWwwRoot = moodleWwwRoot;
- }
- if (moodleUserId != undefined) {
- canvas.moodleUserId = Number(moodleUserId);
- }
- if (moodlePicture != undefined) {
- canvas.moodlePicture = moodlePicture;
- }
- }
-
-
- hib.protocollPort = canvas.rtmpport;
-
- if (canvas.useSSL) {
- hib.protocollName = "rtmps";
- hib.protocollPort = canvas.rtmpsslport;
- }
-
- var scopeRoomId = lz.Browser.getInitArg('scopeRoomId');
- if (scopeRoomId != undefined){
- hib.userScope = scopeRoomId;
- }
-
- //Debug.write("rtmphostlocal,rtmphost:
",canvas.rtmphostlocal,canvas.rtmphost);
- var src =
hib.protocollName+'://'+canvas.rtmphostlocal+':'+hib.protocollPort+'/'+canvas.webAppRootKey+'/'+hib.userScope;
-
- if($debug) Debug.write("src: ",src);
-
- canvas.thishib.setAttribute('src',src);
- //canvas.thishib.loaderVar = new lz.autoLoader(canvas);
- //canvas.thishib.loaderVar._src.setAttribute('text',src);
- canvas.thishib.connect();
-
- if($debug) Debug.write("canvas.currentNC: ",canvas.currentNC);
+
]]>
</method>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/remote/rtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/remote/rtmpConnection.lzx?rev=1240154&r1=1240153&r2=1240154&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/remote/rtmpConnection.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/remote/rtmpConnection.lzx
Fri Feb 3 13:29:46 2012
@@ -82,7 +82,9 @@
<method name="disconnect">
canvas.currentNC = null;
- this._nc.close();
+ if (this._nc != null) {
+ this._nc.close();
+ }
</method>
<!---
With this function all methods are registered to the NetConnection
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/hibAdapter.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/hibAdapter.lzx?rev=1240154&r1=1240153&r2=1240154&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/hibAdapter.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/hibAdapter.lzx
Fri Feb 3 13:29:46 2012
@@ -25,13 +25,13 @@
]]></handler>
<method name="hibAdapter_setLabelObjectByHundred" args="start,value">
- //if($debug)
Debug.write("hibAdapter_setLabelObjectByHundred",start,value);
- setLabelObjectByHundred(start,value);
+ if($debug)
Debug.write("hibAdapter_setLabelObjectByHundred",start,value);
+ // setLabelObjectByHundred(start,value);
</method>
<method name="setRoomValues" args="roomtypes_id,rooms_id,value">
- if($debug) Debug.write("setRoomValues",value);
- canvas.setRoomValues(roomtypes_id,rooms_id,value);
+ if($debug) Debug.write("setRoomValues",roomtypes_id,rooms_id,value);
+ canvas.currentRoomObject = value;
</method>
<method name="getRoomTypes" args="value">
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/library.lzx?rev=1240154&r1=1240153&r2=1240154&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/library.lzx
Fri Feb 3 13:29:46 2012
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
<library>
+ <resource name="warning_icon_popup_devices_rsc"
src="resources/messagebox_warning.png" />
+
<resource name="chatbgitem" src="resources/bgitemvideochat.swf" />
<resource name="showusercontextclose" src="resources/error.png" />
@@ -20,7 +22,6 @@
<resource name="lz_recorder_play" src="resources/webstart_play.png" />
<include href="videoUserProfilePicSWF10.lzx" />
- <!--<include href="remoteUserDetails.lzx" />-->
<include href="editRecordStreamSWF10.lzx" />
<include href="baseVideoObject.lzx" />
<include href="videoObjectBroadcast.lzx" />
@@ -28,8 +29,4 @@
<include href="videoObjectTestBroadcast.lzx" />
<include href="videoObjectPlayTestBroadcast.lzx" />
- <!--
- <include href="videoContainer.lzx" />
- -->
-
</library>
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/resources/messagebox_warning.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/resources/messagebox_warning.png?rev=1240154&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/video/resources/messagebox_warning.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx?rev=1240154&r1=1240153&r2=1240154&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
Fri Feb 3 13:29:46 2012
@@ -448,4 +448,6 @@ and some more references to temp-objects
<!--F12-->
<attribute name="GIVE_EXCLUSIVE_AUDIO_KEY" value="123"/>
+<attribute name="currentNC" value="null" />
+
</library>
