You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by vd...@apache.org on 2013/08/28 11:16:28 UTC
svn commit: r1518115 - in /openmeetings/trunk/singlewebapp/WebContent/src:
./ modules/conference/participants/ modules/conference/whiteboard/
Author: vdegtyarev
Date: Wed Aug 28 09:16:27 2013
New Revision: 1518115
URL: http://svn.apache.org/r1518115
Log:
Some errors are fixed.
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/main.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
Modified: openmeetings/trunk/singlewebapp/WebContent/src/main.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx?rev=1518115&r1=1518114&r2=1518115&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/main.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/main.lzx Wed Aug 28 09:16:27 2013
@@ -82,10 +82,12 @@
<![CDATA[
canvas.sendViaLocalConnection(canvas.vid_lc_name, "clearAll", null);
if($debug) Debug.write("main.lzx/main_content._content.inner.clearAll(): ",this.inner,this.inner.subviews.length);
- var baseContent = this.inner.subviews[0].close();
- for (var eg in this.inner.subviews) {
- if($debug) Debug.write("main.lzx/main_content._content.inner.clearAll()-subviews: ",this.inner.subviews[eg]);
- if (eg!=0) this.inner.subviews[eg].close();
+ if (this.inner.subviews != null) {
+ var baseContent = this.inner.subviews[0].close();
+ for (var eg in this.inner.subviews) {
+ if($debug) Debug.write("main.lzx/main_content._content.inner.clearAll()-subviews: ",this.inner.subviews[eg]);
+ if (eg!=0) this.inner.subviews[eg].close();
+ }
}
return baseContent;
]]>
Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx?rev=1518115&r1=1518114&r2=1518115&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participants/participantListItem.lzx Wed Aug 28 09:16:27 2013
@@ -59,7 +59,7 @@
if ($debug) Debug.write("fadeText :1: ",this.refObj);
if ($debug) Debug.write("fadeText :2: ",this.refObj.picture_uri);
- if (this.refObj.picture_uri.startsWith("http") || this.refObj.picture_uri.startsWith("https")) {
+ if (this.refObj.picture_uri != null && (this.refObj.picture_uri.startsWith("http") || this.refObj.picture_uri.startsWith("https"))) {
var downloadurl = this.refObj.picture_uri;
//Do Load the Custom Moodle Profilee Picture
} else if (this.refObj.externalUserId >= 1 && this.refObj.externalUserType == "moodle") {
Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx?rev=1518115&r1=1518114&r2=1518115&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx Wed Aug 28 09:16:27 2013
@@ -209,7 +209,9 @@
<handler name="ony" args="y">
if (this.sendUpdate) {
if ($debug) Debug.write("# y",y);
- parent.parent.scrollContainer.calcScrollContent();
+ if (parent.parent.scrollContainer != null) {
+ parent.parent.scrollContainer.calcScrollContent();
+ }
}
</handler>
@@ -544,7 +546,9 @@
}
if ($debug) Debug.warn("onvalue Full Fit ",v);
- parent.parent._drawareaMask._drawarea.doUpdateFullFit(v,parent._zoom.initialNumber);
+ if (parent._zoom != null) {
+ parent.parent._drawareaMask._drawarea.doUpdateFullFit(v,parent._zoom.initialNumber);
+ }
</handler>
<labelTooltip labelid="1212" multiline="true" />
</labelCheckbox>
Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx?rev=1518115&r1=1518114&r2=1518115&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteboardPanel.lzx Wed Aug 28 09:16:27 2013
@@ -29,7 +29,9 @@
<handler name="onsharedMessage" args="obj">
//Debug.write("send: ",obj);
this.objWhiteboard = obj;
- this.sendVarsByWhiteboardId.doCall();
+ if (this.sendVarsByWhiteboardId != null){
+ this.sendVarsByWhiteboardId.doCall();
+ }
</handler>
<netRemoteCallHib name="sendVarsByWhiteboardId" funcname="sendVarsByWhiteboardId"