Author: ggrekhov
Date: Mon Mar 19 09:12:49 2012
New Revision: 1302337
URL: http://svn.apache.org/viewvc?rev=1302337&view=rev
Log:
OPENMEETINGS-79 is fixed
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/changeDevice.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx?rev=1302337&r1=1302336&r2=1302337&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/testsetup/testSetup.lzx
Mon Mar 19 09:12:49 2012
@@ -74,7 +74,7 @@ Test the setup values before you enter a
} else if (!this.forceTest && save){
this.startConference();
} else {
-
+
if (this.isDirectLink) {
this._enterMeeting.setAttribute("x",this.width-165);
this._cancel.setAttribute("visibility","hidden");
@@ -119,12 +119,10 @@ Test the setup values before you enter a
canvas._loadingAll.hideLoading();
canvas.lc.send(canvas.rtmp_lc_name, "closeInitTestingApplication");
- //Debug.write("sharedobject store ");
- //var g = canvas.getUserData();
- //g["cam"] = this.currentSharing.availibleCams.getValue();
- //g["mic"] = this.currentSharing.availibleMics.getValue();
- //g["showAudioVideoTest"] = this.holddatainSO.getValue();
- //canvas.setUserData(g);
+ Debug.write("sharedobject store ");
+ var g = canvas.getUserData();
+ g["showAudioVideoTest"] = this.holddatainSO.getValue();
+ canvas.setUserData(g);
]]>
</method>
@@ -147,15 +145,15 @@ Test the setup values before you enter a
]]>
</method>
-
- <!-- Remember Me -->
+
+ <!-- Remember Me -->
<labelCheckbox name="holddatainSO" labelid="759" x="10" y="$once{
parent.height-24 }" >
<handler name="oninit">
var g = canvas.getUserData();
var save = g["showAudioVideoTest"];
if ($debug) Debug.write("savecamdata save: ",save);
if(save) this.setValue(true);
- </handler>
+ </handler>
</labelCheckbox>
<simpleLabelButton name="_enterMeeting" labelid="761" width="160"
x="$once{ parent.width-270 }"
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx?rev=1302337&r1=1302336&r2=1302337&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/audioVideoTest/testingApplication.lzx
Mon Mar 19 09:12:49 2012
@@ -213,14 +213,16 @@ Test the setup values before you enter a
}
var t:SharedObject = SharedObject.getLocal('userdata');
var g = t.data;
- if (g!=null){
- var cam = g["cam"];
+ var cam;
+ if (g != null){
+ cam = g["cam"];
+ if (cam == 'undefined') {
+ cam = r;
+ }
} else {
- var cam = r;
+ cam = r;
}
- if (cam=='undefined' || cam =='' || cam == null) cam=r;
this.selectItem(String(cam));
-
]]>
</handler>
</resetCombobox>
@@ -248,12 +250,15 @@ Test the setup values before you enter a
var t:SharedObject = SharedObject.getLocal('userdata');
var g = t.data;
- if (g!=null){
- var mic = g["mic"];
+ var mic;
+ if (g != null){
+ mic = g["mic"];
+ if (mic == 'undefined') {
+ mic = r;
+ }
} else {
- var mic = r;
+ mic = r;
}
- if (mic=='undefined' || mic =='' || mic ==null) mic=r;
this.selectItem(String(mic));
]]>
</handler>
@@ -380,7 +385,7 @@ Test the setup values before you enter a
<view y="294" resource="test_setup_info_rsc" x="10" />
<labelText fontstyle="bold" labelid="765" x="39" y="290"
- width="$once{ parent.width-50 }" multiline="true" />
+ width="$once{ parent.width-50 }" multiline="true" />
</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/changeDevice.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/changeDevice.lzx?rev=1302337&r1=1302336&r2=1302337&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/changeDevice.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/changeDevice.lzx
Mon Mar 19 09:12:49 2012
@@ -72,14 +72,16 @@
var so:SharedObject = SharedObject.getLocal('userdata');
var sdata = so.data;
- var cam = sdata["cam"];
- //Debug.write("cam: ",cam);
-
- if (cam!=null || cam!=''){
- this.selectItem(String(cam));
+ var cam;
+ if (sdata != null){
+ cam = sdata["cam"];
+ if (cam == 'undefined') {
+ cam = t;
+ }
} else {
- this.selectItem(t);
+ cam = t;
}
+ this.selectItem(String(cam));
]]>
</handler>
</resetCombobox>
@@ -108,14 +110,16 @@
var so:SharedObject = SharedObject.getLocal('userdata');
var sdata = so.data;
- var mic = sdata["mic"];
- //Debug.write("mic: ",mic);
-
- if (mic!=null || mic!=''){
- this.selectItem(String(mic));
+ var mic;
+ if (sdata != null){
+ mic = sdata["mic"];
+ if (mic == 'undefined') {
+ mic = t;
+ }
} else {
- this.selectItem(t);
+ mic = t;
}
+ this.selectItem(String(mic));
]]>
</handler>
</resetCombobox>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx?rev=1302337&r1=1302336&r2=1302337&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/video/editRecordStreamSWF10.lzx
Mon Mar 19 09:12:49 2012
@@ -393,14 +393,16 @@
}
var t:SharedObject =
SharedObject.getLocal('userdata');
var g = t.data;
- if (g!=null){
- var cam = g["cam"];
- } else {
- var cam = r;
- }
- if (cam=='undefined' || cam =='' || cam ==
null) cam=r;
- this.selectItem(String(cam));
-
+ var cam;
+ if (g != null){
+ cam = g["cam"];
+ if (cam == 'undefined') {
+ cam = r;
+ }
+ } else {
+ cam = r;
+ }
+ this.selectItem(String(cam));
]]>
</handler>
</resetCombobox>
@@ -429,13 +431,16 @@
var t:SharedObject = SharedObject.getLocal('userdata');
var g = t.data;
- if (g!=null){
- var mic = g["mic"];
- } else {
- var mic = r;
- }
- if (mic=='undefined' || mic =='' || mic ==null)
mic=r;
- this.selectItem(String(mic));
+ var mic;
+ if (g != null){
+ mic = g["mic"];
+ if (mic == 'undefined') {
+ mic = r;
+ }
+ } else {
+ mic = r;
+ }
+ this.selectItem(String(mic));
]]>
</handler>
</resetCombobox>
