You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/12/05 05:52:39 UTC
svn commit: r1548012 - in /openmeetings:
branches/2.x/WebContent/src/modules/conference/tabcontent/chat/
branches/2.x/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/
branches/2.x/WebContent/src/modules/conference/whiteboard/ trunk/...
Author: solomax
Date: Thu Dec 5 04:52:38 2013
New Revision: 1548012
URL: http://svn.apache.org/r1548012
Log:
[OPENMEETINGS-368] additional fixes: non-moderators are not allowed to open/close documents on WB;
Some SWF errors are guarded;
Modified:
openmeetings/branches/2.x/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
openmeetings/branches/2.x/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx
openmeetings/branches/2.x/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/chartFileExplorerItem.lzx
openmeetings/branches/2.x/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/folderFileExplorerItem.lzx
openmeetings/branches/2.x/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/imageFileExplorerItem.lzx
openmeetings/branches/2.x/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/videoFileExplorerItem.lzx
openmeetings/branches/2.x/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/chartFileExplorerItem.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/folderFileExplorerItem.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/imageFileExplorerItem.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/videoFileExplorerItem.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
Modified: openmeetings/branches/2.x/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx?rev=1548012&r1=1548011&r2=1548012&view=diff
==============================================================================
--- openmeetings/branches/2.x/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx (original)
+++ openmeetings/branches/2.x/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx Thu Dec 5 04:52:38 2013
@@ -128,9 +128,12 @@
<handler name="onisopen" args="o">
if ($debug) Debug.write("onisopen",o);
if (o) {
- canvas._chatcontent.doInitByOpen();
- if (canvas.currentRoomObject != null)
+ if ('doInitByOpen' in canvas._chatcontent) {
+ canvas._chatcontent.doInitByOpen();
+ }
+ if (canvas.currentRoomObject != null) {
content._content1._chattabbottom.updatefontbuttonvisible();
+ }
this.doBlink = false;
this._newMessage.setAttribute("visibility","hidden");
this._newMessage.setAttribute( "opacity", 0 );
Modified: openmeetings/branches/2.x/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx?rev=1548012&r1=1548011&r2=1548012&view=diff
==============================================================================
--- openmeetings/branches/2.x/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx (original)
+++ openmeetings/branches/2.x/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx Thu Dec 5 04:52:38 2013
@@ -179,20 +179,6 @@
</handler>
</dataset>
- <!--
- <netRemoteCallHib name="deleteFileOrFolder" funcname="fileservice.deleteFileOrFolder"
- remotecontext="$once{ canvas.thishib }" >
- <netparam><method name="getValue">return canvas.sessionId;</method></netparam>
- <netparam><method name="getValue">return parent.parent.fileExplorerItemId;</method></netparam>
- <handler name="ondata" args="value">
- if ($debug) Debug.write("deleteFileOrFolder: ",value);
- parent.parent.parent.doOpen();
- parent.refObjListRoot._selected = null;
- parent.refObjListRoot.parentFolderId = -2;
- </handler>
- </netRemoteCallHib>
- -->
-
<method name="doSingleClick" args="itemObj">
this.singleClickStarted = false;
//Cannot change name for Root Icons
@@ -243,29 +229,53 @@
</method>
<method name="playVideo">
+ <![CDATA[
+ if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
+ new lz.labelerrorPopup(canvas,{errorlabelid:1462});
+ return;
+ }
this.refObjListRoot.playVideo(this);
+ ]]>
</method>
<method name="editFolderName">
- <![CDATA[
- if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
- new lz.labelerrorPopup(canvas,{errorlabelid:1462});
- return;
- }
- this.addOrUpdateFolderName(this.fileExplorerItemId,false);
- ]]>
+ <![CDATA[
+ if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
+ new lz.labelerrorPopup(canvas,{errorlabelid:1462});
+ return;
+ }
+ this.addOrUpdateFolderName(this.fileExplorerItemId,false);
+ ]]>
</method>
<method name="loadDocument">
+ <![CDATA[
+ if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
+ new lz.labelerrorPopup(canvas,{errorlabelid:1462});
+ return;
+ }
this.refObjListRoot.loadDocument(this);
+ ]]>
</method>
<method name="loadWmlFile">
+ <![CDATA[
+ if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
+ new lz.labelerrorPopup(canvas,{errorlabelid:1462});
+ return;
+ }
this.refObjListRoot.loadWmlFile(this);
+ ]]>
</method>
<method name="loadChart">
+ <![CDATA[
+ if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
+ new lz.labelerrorPopup(canvas,{errorlabelid:1462});
+ return;
+ }
this.refObjListRoot.loadChart(this);
+ ]]>
</method>
<method name="addOrUpdateFolderName" args="fileExplorerItemId,isNew">
Modified: openmeetings/branches/2.x/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/chartFileExplorerItem.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/chartFileExplorerItem.lzx?rev=1548012&r1=1548011&r2=1548012&view=diff
==============================================================================
--- openmeetings/branches/2.x/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/chartFileExplorerItem.lzx (original)
+++ openmeetings/branches/2.x/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/chartFileExplorerItem.lzx Thu Dec 5 04:52:38 2013
@@ -32,10 +32,6 @@
<contextmenuitem caption="$once{ canvas.getLabelName(711) }"
onselect="parent.parent.parent.editFolderName()" />
- <!-- <contextmenuitem name="_openDocument" caption="$once{ canvas.getLabelName(716)
- }" separatorbefore="true" onselect="parent.parent.parent.loadDocument()"
- /> -->
-
<contextmenuitem caption="$once{ canvas.getLabelName(708) }"
separatorbefore="true" onselect="parent.parent.parent.addFile()" />
Modified: openmeetings/branches/2.x/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/folderFileExplorerItem.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/folderFileExplorerItem.lzx?rev=1548012&r1=1548011&r2=1548012&view=diff
==============================================================================
--- openmeetings/branches/2.x/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/folderFileExplorerItem.lzx (original)
+++ openmeetings/branches/2.x/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/folderFileExplorerItem.lzx Thu Dec 5 04:52:38 2013
@@ -28,13 +28,6 @@
<contextmenuitem caption="$once{ canvas.getLabelName(711) }"
onselect="parent.parent.parent.editFolderName()" />
- <!--
- <contextmenuitem name="_openDocument"
- caption="$once{ canvas.getLabelName(716) }"
- separatorbefore="true"
- onselect="parent.parent.parent.loadDocument()" />
- -->
-
<contextmenuitem caption="$once{ canvas.getLabelName(708) }"
separatorbefore="true"
onselect="parent.parent.parent.addFile()" />
Modified: openmeetings/branches/2.x/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/imageFileExplorerItem.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/imageFileExplorerItem.lzx?rev=1548012&r1=1548011&r2=1548012&view=diff
==============================================================================
--- openmeetings/branches/2.x/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/imageFileExplorerItem.lzx (original)
+++ openmeetings/branches/2.x/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/imageFileExplorerItem.lzx Thu Dec 5 04:52:38 2013
@@ -51,14 +51,6 @@
<contextmenuitem caption="$once{ canvas.getLabelName(711) }"
onselect="parent.parent.parent.editFolderName()" />
- <!--
- //Load File To Whiteboard missing
- <contextmenuitem name="_openDocument"
- caption="$once{ canvas.getLabelName(716) }"
- separatorbefore="true"
- onselect="parent.parent.parent.loadDocument()" />
- -->
-
<contextmenuitem caption="$once{ canvas.getLabelName(719) }"
onselect="parent.parent.parent.deleteFile(719)" />
Modified: openmeetings/branches/2.x/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/videoFileExplorerItem.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/videoFileExplorerItem.lzx?rev=1548012&r1=1548011&r2=1548012&view=diff
==============================================================================
--- openmeetings/branches/2.x/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/videoFileExplorerItem.lzx (original)
+++ openmeetings/branches/2.x/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/videoFileExplorerItem.lzx Thu Dec 5 04:52:38 2013
@@ -54,14 +54,6 @@
<contextmenuitem caption="$once{ canvas.getLabelName(711) }"
onselect="parent.parent.parent.editFolderName()" />
- <!--
- //Load File To Whiteboard missing
- <contextmenuitem name="_openDocument"
- caption="$once{ canvas.getLabelName(716) }"
- separatorbefore="true"
- onselect="parent.parent.parent.loadDocument()" />
- -->
-
<contextmenuitem caption="$once{ canvas.getLabelName(719) }"
onselect="parent.parent.parent.deleteFile(719)" />
Modified: openmeetings/branches/2.x/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx?rev=1548012&r1=1548011&r2=1548012&view=diff
==============================================================================
--- openmeetings/branches/2.x/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx (original)
+++ openmeetings/branches/2.x/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx Thu Dec 5 04:52:38 2013
@@ -202,34 +202,42 @@
<handler name="onx" args="x">
if (this.sendUpdate) {
if ($debug) Debug.write("# x",x);
- parent.parent.scrollContainer.calcScrollContent();
+ if ('scrollContainer' in parent.parent) {
+ parent.parent.scrollContainer.calcScrollContent();
+ }
}
</handler>
<handler name="ony" args="y">
if (this.sendUpdate) {
if ($debug) Debug.write("# y",y);
- if (parent.parent.scrollContainer != null){
+ if ('scrollContainer' in parent.parent) {
parent.parent.scrollContainer.calcScrollContent();
- }
+ }
}
</handler>
<handler name="onheight" args="h">
if ($debug) Debug.write("# height",h);
//this.dragger.drag_min_x = parent.width - w;
- parent.parent.scrollContainer.calcScrollContent();
+ if ('scrollContainer' in parent.parent) {
+ parent.parent.scrollContainer.calcScrollContent();
+ }
</handler>
<handler name="onwidth" args="w">
if ($debug) Debug.write("# width",w);
//this.dragger.drag_min_y = parent.height - h;
- parent.parent.scrollContainer.calcScrollContent();
+ if ('scrollContainer' in parent.parent) {
+ parent.parent.scrollContainer.calcScrollContent();
+ }
</handler>
<handler name="onupdateScale" args="tRef">
if ($debug) Debug.write("# updateScale",this.getDisplayObject()._xscale);
- parent.parent.scrollContainer.calcScrollContent();
+ if ('scrollContainer' in parent.parent) {
+ parent.parent.scrollContainer.calcScrollContent();
+ }
</handler>
<attribute name="initH"/>
@@ -476,8 +484,7 @@
<![CDATA[
for (var i=0;i<this.subviews.length;i++) {
if (this.subviews[i].y != 0) {
- if (this.subviews[i] instanceof lz.mainToolsTopPanel
- || this.subviews[i] instanceof lz.documentIconTopPanel) {
+ if (this.subviews[i] instanceof lz.mainToolsTopPanel) {
if (objRef.height<=22){
if (this.subviews[i].y+this.subviews[i].height+5>=parent.parent.height-objRef.initheight-21){
if ($debug) Debug.write("mainToolsTopPanel");
@@ -524,7 +531,9 @@
<method name="setWhiteboardValues" args="fullFit,zoom">
if ($debug) Debug.write("setWhiteboardValues -1- ",fullFit,zoom);
this.ignoreUpdates = true;
- this._zoom.setSliderValue(zoom);
+ if ('_zoom' in this) {
+ this._zoom.setSliderValue(zoom);
+ }
this._fullFit.setValue(fullFit);
this.ignoreUpdates = false;
</method>
@@ -532,7 +541,9 @@
<method name="setCurrentScaleByFullFit" args="tScale">
if ($debug) Debug.write("setCurrentScaleByFullFit -2- ",tScale);
this.ignoreUpdates = true;
- this._zoom.setSliderValue(tScale);
+ if ('_zoom' in this) {
+ this._zoom.setSliderValue(tScale);
+ }
this.ignoreUpdates = false;
</method>
@@ -544,7 +555,9 @@
}
if ($debug) Debug.warn("onvalue Full Fit ",v);
- parent.parent._drawareaMask._drawarea.doUpdateFullFit(v,parent._zoom.initialNumber);
+ if ('_zoom' in parent) {
+ parent.parent._drawareaMask._drawarea.doUpdateFullFit(v,parent._zoom.initialNumber);
+ }
</handler>
<labelTooltip labelid="1212" multiline="true" />
</labelCheckbox>
Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx?rev=1548012&r1=1548011&r2=1548012&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/chat/baseTabChatPanel.lzx Thu Dec 5 04:52:38 2013
@@ -128,9 +128,12 @@
<handler name="onisopen" args="o">
if ($debug) Debug.write("onisopen",o);
if (o) {
- canvas._chatcontent.doInitByOpen();
- if (canvas.currentRoomObject != null)
+ if ('doInitByOpen' in canvas._chatcontent) {
+ canvas._chatcontent.doInitByOpen();
+ }
+ if (canvas.currentRoomObject != null) {
content._content1._chattabbottom.updatefontbuttonvisible();
+ }
this.doBlink = false;
this._newMessage.setAttribute("visibility","hidden");
this._newMessage.setAttribute( "opacity", 0 );
Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx?rev=1548012&r1=1548011&r2=1548012&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx Thu Dec 5 04:52:38 2013
@@ -179,20 +179,6 @@
</handler>
</dataset>
- <!--
- <netRemoteCallHib name="deleteFileOrFolder" funcname="fileservice.deleteFileOrFolder"
- remotecontext="$once{ canvas.thishib }" >
- <netparam><method name="getValue">return canvas.sessionId;</method></netparam>
- <netparam><method name="getValue">return parent.parent.fileExplorerItemId;</method></netparam>
- <handler name="ondata" args="value">
- if ($debug) Debug.write("deleteFileOrFolder: ",value);
- parent.parent.parent.doOpen();
- parent.refObjListRoot._selected = null;
- parent.refObjListRoot.parentFolderId = -2;
- </handler>
- </netRemoteCallHib>
- -->
-
<method name="doSingleClick" args="itemObj">
this.singleClickStarted = false;
//Cannot change name for Root Icons
@@ -243,29 +229,53 @@
</method>
<method name="playVideo">
+ <![CDATA[
+ if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
+ new lz.labelerrorPopup(canvas,{errorlabelid:1462});
+ return;
+ }
this.refObjListRoot.playVideo(this);
+ ]]>
</method>
<method name="editFolderName">
- <![CDATA[
- if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
- new lz.labelerrorPopup(canvas,{errorlabelid:1462});
- return;
- }
- this.addOrUpdateFolderName(this.fileExplorerItemId,false);
- ]]>
+ <![CDATA[
+ if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
+ new lz.labelerrorPopup(canvas,{errorlabelid:1462});
+ return;
+ }
+ this.addOrUpdateFolderName(this.fileExplorerItemId,false);
+ ]]>
</method>
<method name="loadDocument">
+ <![CDATA[
+ if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
+ new lz.labelerrorPopup(canvas,{errorlabelid:1462});
+ return;
+ }
this.refObjListRoot.loadDocument(this);
+ ]]>
</method>
<method name="loadWmlFile">
+ <![CDATA[
+ if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
+ new lz.labelerrorPopup(canvas,{errorlabelid:1462});
+ return;
+ }
this.refObjListRoot.loadWmlFile(this);
+ ]]>
</method>
<method name="loadChart">
+ <![CDATA[
+ if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
+ new lz.labelerrorPopup(canvas,{errorlabelid:1462});
+ return;
+ }
this.refObjListRoot.loadChart(this);
+ ]]>
</method>
<method name="addOrUpdateFolderName" args="fileExplorerItemId,isNew">
Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/chartFileExplorerItem.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/chartFileExplorerItem.lzx?rev=1548012&r1=1548011&r2=1548012&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/chartFileExplorerItem.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/chartFileExplorerItem.lzx Thu Dec 5 04:52:38 2013
@@ -32,10 +32,6 @@
<contextmenuitem caption="$once{ canvas.getLabelName(711) }"
onselect="parent.parent.parent.editFolderName()" />
- <!-- <contextmenuitem name="_openDocument" caption="$once{ canvas.getLabelName(716)
- }" separatorbefore="true" onselect="parent.parent.parent.loadDocument()"
- /> -->
-
<contextmenuitem caption="$once{ canvas.getLabelName(708) }"
separatorbefore="true" onselect="parent.parent.parent.addFile()" />
Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/folderFileExplorerItem.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/folderFileExplorerItem.lzx?rev=1548012&r1=1548011&r2=1548012&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/folderFileExplorerItem.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/folderFileExplorerItem.lzx Thu Dec 5 04:52:38 2013
@@ -28,13 +28,6 @@
<contextmenuitem caption="$once{ canvas.getLabelName(711) }"
onselect="parent.parent.parent.editFolderName()" />
- <!--
- <contextmenuitem name="_openDocument"
- caption="$once{ canvas.getLabelName(716) }"
- separatorbefore="true"
- onselect="parent.parent.parent.loadDocument()" />
- -->
-
<contextmenuitem caption="$once{ canvas.getLabelName(708) }"
separatorbefore="true"
onselect="parent.parent.parent.addFile()" />
Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/imageFileExplorerItem.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/imageFileExplorerItem.lzx?rev=1548012&r1=1548011&r2=1548012&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/imageFileExplorerItem.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/imageFileExplorerItem.lzx Thu Dec 5 04:52:38 2013
@@ -51,14 +51,6 @@
<contextmenuitem caption="$once{ canvas.getLabelName(711) }"
onselect="parent.parent.parent.editFolderName()" />
- <!--
- //Load File To Whiteboard missing
- <contextmenuitem name="_openDocument"
- caption="$once{ canvas.getLabelName(716) }"
- separatorbefore="true"
- onselect="parent.parent.parent.loadDocument()" />
- -->
-
<contextmenuitem caption="$once{ canvas.getLabelName(719) }"
onselect="parent.parent.parent.deleteFile(719)" />
Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/videoFileExplorerItem.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/videoFileExplorerItem.lzx?rev=1548012&r1=1548011&r2=1548012&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/videoFileExplorerItem.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/tabcontent/fileexplorer/treeitems/videoFileExplorerItem.lzx Thu Dec 5 04:52:38 2013
@@ -54,14 +54,6 @@
<contextmenuitem caption="$once{ canvas.getLabelName(711) }"
onselect="parent.parent.parent.editFolderName()" />
- <!--
- //Load File To Whiteboard missing
- <contextmenuitem name="_openDocument"
- caption="$once{ canvas.getLabelName(716) }"
- separatorbefore="true"
- onselect="parent.parent.parent.loadDocument()" />
- -->
-
<contextmenuitem caption="$once{ canvas.getLabelName(719) }"
onselect="parent.parent.parent.deleteFile(719)" />
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=1548012&r1=1548011&r2=1548012&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx Thu Dec 5 04:52:38 2013
@@ -202,35 +202,43 @@
<handler name="onx" args="x">
if (this.sendUpdate) {
if ($debug) Debug.write("# x",x);
- parent.parent.scrollContainer.calcScrollContent();
+ if ('scrollContainer' in parent.parent) {
+ parent.parent.scrollContainer.calcScrollContent();
+ }
}
</handler>
<handler name="ony" args="y">
if (this.sendUpdate) {
if ($debug) Debug.write("# y",y);
- if (parent.parent.scrollContainer != null) {
+ if ('scrollContainer' in parent.parent) {
parent.parent.scrollContainer.calcScrollContent();
- }
+ }
}
</handler>
<handler name="onheight" args="h">
if ($debug) Debug.write("# height",h);
//this.dragger.drag_min_x = parent.width - w;
- parent.parent.scrollContainer.calcScrollContent();
+ if ('scrollContainer' in parent.parent) {
+ parent.parent.scrollContainer.calcScrollContent();
+ }
parent.parent.zoombox.sendUpdate(null);
</handler>
<handler name="onwidth" args="w">
if ($debug) Debug.write("# width",w);
//this.dragger.drag_min_y = parent.height - h;
- parent.parent.scrollContainer.calcScrollContent();
+ if ('scrollContainer' in parent.parent) {
+ parent.parent.scrollContainer.calcScrollContent();
+ }
</handler>
<handler name="onupdateScale" args="tRef">
if ($debug) Debug.write("# updateScale",this.getDisplayObject()._xscale);
- parent.parent.scrollContainer.calcScrollContent();
+ if ('scrollContainer' in parent.parent) {
+ parent.parent.scrollContainer.calcScrollContent();
+ }
</handler>
<attribute name="initH"/>
@@ -477,8 +485,7 @@
<![CDATA[
for (var i=0;i<this.subviews.length;i++) {
if (this.subviews[i].y != 0) {
- if (this.subviews[i] instanceof lz.mainToolsTopPanel
- || this.subviews[i] instanceof lz.documentIconTopPanel) {
+ if (this.subviews[i] instanceof lz.mainToolsTopPanel) {
if (objRef.height<=22){
if (this.subviews[i].y+this.subviews[i].height+5>=parent.parent.height-objRef.initheight-21){
if ($debug) Debug.write("mainToolsTopPanel");
@@ -526,7 +533,9 @@
<method name="setWhiteboardValues" args="fullFit,zoom">
if ($debug) Debug.write("setWhiteboardValues -1- ",fullFit,zoom);
this.ignoreUpdates = true;
- this._zoom.setSliderValue(zoom);
+ if ('_zoom' in this) {
+ this._zoom.setSliderValue(zoom);
+ }
this._fullFit.setValue(fullFit);
this.ignoreUpdates = false;
</method>
@@ -534,7 +543,9 @@
<method name="setCurrentScaleByFullFit" args="tScale">
if ($debug) Debug.write("setCurrentScaleByFullFit -2- ",tScale);
this.ignoreUpdates = true;
- this._zoom.setSliderValue(tScale);
+ if ('_zoom' in this) {
+ this._zoom.setSliderValue(tScale);
+ }
this.ignoreUpdates = false;
</method>
@@ -546,9 +557,9 @@
}
if ($debug) Debug.warn("onvalue Full Fit ",v);
- if (parent._zoom != null) {
+ if ('_zoom' in parent) {
parent.parent._drawareaMask._drawarea.doUpdateFullFit(v,parent._zoom.initialNumber);
- }
+ }
</handler>
<labelTooltip labelid="1212" multiline="true" />
</labelCheckbox>