Author: solomax
Date: Thu Nov 26 04:09:35 2015
New Revision: 1716565
URL: http://svn.apache.org/viewvc?rev=1716565&view=rev
Log:
[OPENMEETINGS-1279] more work on file tree
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/dragItemFileExplorer.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/dynamicFileName.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/presentations/items/listPresentationFilePDFExplorer.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/presentations/presentationFilesList.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/presentations/presentationPreview.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/remoteWhiteboard.lzx
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/dragItemFileExplorer.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/dragItemFileExplorer.lzx?rev=1716565&r1=1716564&r2=1716565&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/dragItemFileExplorer.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/dragItemFileExplorer.lzx
Thu Nov 26 04:09:35 2015
@@ -30,7 +30,7 @@
<attribute name="alreadySent" value="false" type="boolean" />
- <attribute name="fileExplorerItemId" value="0" type="number" />
+ <attribute name="fileId" value="0" type="number" />
<attribute name="newParentFileExplorerItemId" value="0" type="number" />
<attribute name="isOwner" value="false" type="boolean" />
<attribute name="moveToHome" value="false" type="boolean" />
@@ -89,7 +89,7 @@
if (this.overItem["isTrashCan"] && this.overItem.isTrashCan) {
if ($debug) Debug.write("SEND TO GARBAGE");
- this.fileExplorerItemId =
this.refObj.fileExplorerItemId;
+ this.fileId = this.refObj.fileId;
new lz.confirmationSingle(canvas,{
refObj:this,
labelid:710,
@@ -98,11 +98,11 @@
refReturnMethod:"sendConfirmation"
});
} else if (this.overItem["isFolder"] && this.overItem.isFolder){
- if ($debug) Debug.write("MOVE
ITEM",this.refObj.fileExplorerItemId);
- if ($debug) Debug.write("MOVE TO
PARENT",this.overItem.fileExplorerItemId);
- this.fileExplorerItemId =
this.refObj.fileExplorerItemId;
- this.newParentFileExplorerItemId =
this.overItem.fileExplorerItemId;
- if (this.overItem.fileExplorerItemId == 0) {
+ if ($debug) Debug.write("MOVE ITEM",this.refObj.fileId);
+ if ($debug) Debug.write("MOVE TO
PARENT",this.overItem.fileId);
+ this.fileId = this.refObj.fileId;
+ this.newParentFileExplorerItemId = this.overItem.fileId;
+ if (this.overItem.fileId == 0) {
this.isOwner = this.overItem.isOwner;
}
@@ -112,7 +112,7 @@
this.moveToHome = checkForOwer;
//check that the file is not moved inside itself
- if
(this.overItem.checkForIsChild(this.refObj.fileExplorerItemId)) {
+ if (this.overItem.checkForIsChild(this.refObj.fileId)) {
new
lz.labelerrorPopup(canvas,{errorlabelid:922});
this.destroy();
return;
@@ -153,7 +153,7 @@
if ($debug) Debug.write("deleteFileOrFolder HTTP 2: ");
var downloadurl =
canvas.getUrl()+'services/FileService/deleteFileOrFolderSelf?'
+'SID='+canvas.sessionId
- +'&fileExplorerItemId='+this.fileExplorerItemId;
+ +'&fileId='+this.fileId;
this.deleteFileOrFolderSelf.setAttribute("src",downloadurl);
if ($debug) Debug.write("deleteFileOrFolderSelf doRequest
",downloadurl);
@@ -172,31 +172,12 @@
</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.fileExplorerItemId;</method></netparam>
- <handler name="ondata" args="value">
- if ($debug) Debug.write("deleteFileOrFolder: ",value);
- parent.refObj.parent.parent.doOpen();
- parent.destroy();
- </handler>
- </netRemoteCallHib>
- -->
-
- <!--
- public Long moveFileSelf(String SID, Long fileExplorerItemId,
- Long newParentFileExplorerItemId, Long room_id, Boolean isOwner,
- Boolean moveToHome)
- -->
-
<method name="moveFile">
<![CDATA[
if ($debug) Debug.write("moveFile HTTP 1: ");
var downloadurl =
canvas.getUrl()+'services/FileService/moveFileSelfInternal?'
+'SID='+canvas.sessionId
- +'&fileExplorerItemId='+this.fileExplorerItemId
+ +'&fileId='+this.fileId
+'&newParentFileExplorerItemId='+this.newParentFileExplorerItemId
+'&roomId='+hib.currentroomid
+'&isOwner='+this.isOwner
@@ -220,29 +201,6 @@
</handler>
</dataset>
- <!--
- <netRemoteCallHib name="moveFile" funcname="fileservice.moveFile"
- remotecontext="$once{ canvas.thishib }" >
-
- <attribute name="fileExplorerItemId" value="0" type="number" />
-
-
- <netparam><method name="getValue">return
canvas.sessionId;</method></netparam>
- <netparam><method name="getValue">return
parent.fileExplorerItemId;</method></netparam>
- <netparam><method name="getValue">return
parent.newParentFileExplorerItemId;</method></netparam>
- <netparam><method name="getValue">return
hib.currentroomid;</method></netparam>
- <netparam><method name="getValue">return
parent.isOwner;</method></netparam>
- <netparam><method name="getValue">return
parent.moveToHome;</method></netparam>
-
- <handler name="ondata" args="value">
- if ($debug) Debug.write("moveFile: ",value);
- parent.overItem.doOpen();
- parent.refObj.parent.parent.doOpen();
- parent.destroy();
- </handler>
- </netRemoteCallHib>
- -->
-
<view name="_dragFileSymbol" x="10" y="10"
resource="$once{ parent.dragItemResource }" />
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/dynamicFileName.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/dynamicFileName.lzx?rev=1716565&r1=1716564&r2=1716565&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/dynamicFileName.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/dynamicFileName.lzx
Thu Nov 26 04:09:35 2015
@@ -26,16 +26,16 @@
<attribute name="isNew" value="false" type="boolean" />
<!-- Only used in case its an update -->
- <attribute name="fileExplorerItemId" value="0" type="number" />
+ <attribute name="fileId" value="0" type="number" />
- <attribute name="parentFileExplorerItemId" value="0" type="number" />
+ <attribute name="parentId" value="0" type="number" />
<attribute name="isOwner" value="false" type="boolean" />
<attribute name="refObj" value="null" />
<handler name="onblur">
lz.ModeManager.release(this);
- if ($debug) Debug.write("Store and Destroy
",this.parentFileExplorerItemId);
+ if ($debug) Debug.write("Store and Destroy ",this.parentId);
if (this.isNew) {
this.addFolder();
} else {
@@ -51,17 +51,12 @@
]]>
</handler>
- <!--
- public Long addFolderSelf(String SID, Long parentFileExplorerItemId,
- String fileName, Long room_id, Boolean isOwner)
- -->
-
<method name="addFolder">
<![CDATA[
if ($debug) Debug.write("moveFile HTTP 1: ");
var downloadurl =
canvas.getUrl()+'services/FileService/addFolderSelfInternal?'
+'SID='+canvas.sessionId
-
+'&parentFileExplorerItemId='+this.parentFileExplorerItemId
+ +'&parentId='+this.parentId
+'&fileName='+this.text
+'&roomId='+hib.currentroomid
+'&isOwner='+this.isOwner;
@@ -82,31 +77,12 @@
</handler>
</dataset>
- <!--
- <netRemoteCallHib name="addFolder" funcname="fileservice.addFolder"
- remotecontext="$once{ canvas.thishib }" >
- <netparam><method name="getValue">return
canvas.sessionId;</method></netparam>
- <netparam><method name="getValue">return
parent.parent.parentFileExplorerItemId;</method></netparam>
- <netparam><method name="getValue">return
parent.parent.text;</method></netparam>
- <netparam><method name="getValue">return
hib.currentroomid;</method></netparam>
- <netparam><method name="getValue">return
parent.parent.isOwner;</method></netparam>
- <handler name="ondata" args="value">
- if ($debug) Debug.write("addFolder: ",value);
- parent.completed(value);
- </handler>
- </netRemoteCallHib>
- -->
-
- <!--
- public Long updateFileOrFolderNameSelf(String SID, Long fileExplorerItemId,
- String fileName)
- -->
<method name="updateFileOrFolderName">
<![CDATA[
if ($debug) Debug.write("moveFile HTTP 1: ");
var downloadurl =
canvas.getUrl()+'services/FileService/updateFileOrFolderNameSelf?'
+'SID='+canvas.sessionId
- +'&fileExplorerItemId='+this.fileExplorerItemId
+ +'&fileId='+this.fileId
+'&fileName='+this.text;
this.updateFileOrFolderNameSelf.setAttribute("src",downloadurl);
@@ -125,21 +101,7 @@
</handler>
</dataset>
- <!--
- <netRemoteCallHib name="updateFileOrFolderName"
funcname="fileservice.updateFileOrFolderName"
- remotecontext="$once{ canvas.thishib }" >
- <netparam><method name="getValue">return
canvas.sessionId;</method></netparam>
- <netparam><method name="getValue">return
parent.parent.fileExplorerItemId;</method></netparam>
- <netparam><method name="getValue">return
parent.parent.text;</method></netparam>
- <handler name="ondata" args="value">
- if ($debug) Debug.write("updateFileOrFolderName:
",parent.fileExplorerItemId);
- parent.completedRename();
- </handler>
- </netRemoteCallHib>
- -->
-
<method name="completed">
- //this.refObj.fileExplorerItemId = fileExplorerItemId;
this.refObj.setAttribute("fileName",this.getText());
this.refObj.parent.parent.doOpen();
this.destroy();
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx?rev=1716565&r1=1716564&r2=1716565&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/fileExplorer.lzx
Thu Nov 26 04:09:35 2015
@@ -63,14 +63,14 @@
this._selected.selectItem();
//Set parent folder id for next Folder or uploaded file
- if (this._selected.fileExplorerItemId == 0) {
+ if (this._selected.fileId == 0) {
if (this._selected.isOwner) {
this.parentFolderId = -2;
} else {
this.parentFolderId = 0;
}
} else {
- this.parentFolderId = this._selected.fileExplorerItemId;
+ this.parentFolderId = this._selected.fileId;
}
</method>
@@ -158,7 +158,7 @@
<method name="playVideo" args="itemObj">
this.selectItem(itemObj);
-
canvas._drawarea.playVideoSynced(itemObj.fileExplorerItemId,itemObj.fileName,itemObj.flvWidth,itemObj.flvHeight);
+
canvas._drawarea.playVideoSynced(itemObj.fileId,itemObj.fileName,itemObj.flvWidth,itemObj.flvHeight);
</method>
<method name="loadFiles">
@@ -194,113 +194,6 @@
if ($debug) Debug.error("httpRequestError ", event);
</method>
- <method name="parseParentToRoomObject" args="dObj">
- <![CDATA[
-
- var filesObject = new Array();
-
- var tFiles = dObj.childNodes[0].childNodes;
-
- if ($debug) Debug.write("parseParentToRoomObject tFiles ",tFiles);
-
- for (var i=0;i<tFiles.length;i++) {
-
- filesObject.push(this.parseToFileObj(tFiles[i].childNodes));
-
- }
-
- return filesObject;
- ]]>
- </method>
-
- <method name="parseToFileObj" args="dObj">
- <![CDATA[
-
- var tFileObj = new Object();
-
- var type = "string";
-
- for (var i=0;i<dObj.length;i++) {
-
- type = "string";
-
- switch (dObj[i].nodeName){
- case "externalFileId":
- type = "int";
- break;
- case "fileExplorerItemId":
- type = "int";
- break;
- case "fileSize":
- type = "int";
- break;
- case "flvHeight":
- type = "int";
- break;
- case "flvWidth":
- type = "int";
- break;
- case "insertedBy":
- type = "int";
- break;
- case "isChart":
- type = "boolean";
- break;
- case "isFolder":
- type = "boolean";
- break;
- case "isImage":
- type = "boolean";
- break;
- case "isPresentation":
- type = "boolean";
- break;
- case "isStoredWmlFile":
- type = "boolean";
- break;
- case "isVideo":
- type = "boolean";
- break;
- case "ownerId":
- type = "int";
- break;
- case "parentFileExplorerItemId":
- type = "int";
- break;
- case "room_id":
- type = "int";
- break;
- default:
- break;
- }
-
- //if ($debug) Debug.write("Obj attr ",dObj[i].nodeName,type);
-
- if (dObj[i].childNodes.length > 0) {
- switch (type) {
- case "int":
- tFileObj[dObj[i].nodeName] =
Number(dObj[i].childNodes[0].data);
- break;
- case "boolean":
- tFileObj[dObj[i].nodeName] =
(dObj[i].childNodes[0].data == "true") ? true : false;
- break;
- default:
- tFileObj[dObj[i].nodeName] =
dObj[i].childNodes[0].data;
- break;
- }
- } else {
- tFileObj[dObj[i].nodeName] = null;
- }
-
- //if ($debug) Debug.write("Obj attr
",dObj[i].nodeName,tFileObj[dObj[i].nodeName]);
-
- }
-
- return tFileObj;
-
- ]]>
- </method>
-
<method name="setSize" args="size, el">
var sizem = Math.round((size / 1024 / 1024) * 100) / 100;
el.setAttribute("text","" + sizem + " MBytes");
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/presentations/items/listPresentationFilePDFExplorer.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/presentations/items/listPresentationFilePDFExplorer.lzx?rev=1716565&r1=1716564&r2=1716565&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/presentations/items/listPresentationFilePDFExplorer.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/presentations/items/listPresentationFilePDFExplorer.lzx
Thu Nov 26 04:09:35 2015
@@ -21,16 +21,14 @@
<library>
<class name="listPresentationFilePDFExplorer"
extends="baseListPresentationItemExplorer" selectable="false">
-
-
<attribute name="pdfname" value="null" />
<attribute name="swfName" value="null" />
- <attribute name="fileExplorerItemId" value="-1" type="number" />
+ <attribute name="fileId" value="-1" type="number" />
<method name="loadFileByName" args="filename">
<![CDATA[
- var lzURLToLoad =
this.formatURL(filename)+"&fileExplorerItemId="+this.fileExplorerItemId;
+ var lzURLToLoad =
this.formatURL(filename)+"&fileId="+this.fileId;
if ($debug) Debug.write("lzURLToLoad ",lzURLToLoad);
lz.Browser.loadURL(lzURLToLoad,'_parent');
]]>
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/presentations/presentationFilesList.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/presentations/presentationFilesList.lzx?rev=1716565&r1=1716564&r2=1716565&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/presentations/presentationFilesList.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/presentations/presentationFilesList.lzx
Thu Nov 26 04:09:35 2015
@@ -37,8 +37,8 @@
uploadmodul:this.uploadmodul,thumbname:thumbName,no:no});
</method>
- <method name="addListpresentationFileOrig"
args="originalName,pdfname,swfName,fileExplorerItemId">
- if ($debug) Debug.write("addListpresentationFileOrig
",originalName,pdfname,swfName,fileExplorerItemId);
+ <method name="addListpresentationFileOrig"
args="originalName,pdfname,swfName,fileId">
+ if ($debug) Debug.write("addListpresentationFileOrig
",originalName,pdfname,swfName,fileId);
new lz.listPresentationFileOrigExplorer(this._table._listcontent,{
isExplorer:true,
isoriginal:true,
@@ -46,19 +46,19 @@
originalName:originalName,
pdfname:pdfname,
swfName:swfName,
-
fileExplorerItemId:fileExplorerItemId
+ fileId:fileId
});
</method>
- <method name="addListpresentationFilePDF"
args="pdfname,swfName,fileExplorerItemId">
- if ($debug) Debug.write("addListpresentationFilePDF
",pdfname,swfName,fileExplorerItemId);
+ <method name="addListpresentationFilePDF" args="pdfname,swfName,fileId">
+ if ($debug) Debug.write("addListpresentationFilePDF
",pdfname,swfName,fileId);
new lz.listPresentationFilePDFExplorer(this._table._listcontent,{
isExplorer:true,
isoriginal:true,
uploadmodul:this.uploadmodul,
pdfname:pdfname,
swfName:swfName,
-
fileExplorerItemId:fileExplorerItemId
+ fileId:fileId
});
</method>
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/presentations/presentationPreview.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/presentations/presentationPreview.lzx?rev=1716565&r1=1716564&r2=1716565&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/presentations/presentationPreview.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/presentations/presentationPreview.lzx
Thu Nov 26 04:09:35 2015
@@ -39,7 +39,7 @@
<method name="addFolderSequence">
<![CDATA[
if ($debug) Debug.write("foldername 1 ",this.documentObj.fileHash);
- if ($debug) Debug.write("foldername 2
",this.documentObj.fileExplorerItemId);
+ if ($debug) Debug.write("foldername 2 ",this.documentObj.fileId);
canvas.uploadmoduleimgfolder = '/'+this.documentObj.fileHash;
this.getPresentationPreviewFileExplorer.doCall();
]]>
@@ -66,11 +66,11 @@
if (presentationObject.pdfDocument==null){
//Is PDF only
//Debug.write("Is PDF only");
-
this._imageslistdraw.addListpresentationFilePDF(presentationObject.originalDocument,presentationObject.swfDocument,this.documentObj.fileExplorerItemId);
+
this._imageslistdraw.addListpresentationFilePDF(presentationObject.originalDocument,presentationObject.swfDocument,this.documentObj.fileId);
} else {
//Is original Document + PDF-Document
//Debug.write("Is original Document + PDF-Document");
-
this._imageslistdraw.addListpresentationFileOrig(presentationObject.originalDocument,presentationObject.pdfDocument,presentationObject.swfDocument,this.documentObj.fileExplorerItemId);
+
this._imageslistdraw.addListpresentationFileOrig(presentationObject.originalDocument,presentationObject.pdfDocument,presentationObject.swfDocument,this.documentObj.fileId);
}
for (var eg=0;eg<presentationObject.thumbs.thumbs.length;eg++){
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx?rev=1716565&r1=1716564&r2=1716565&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/treeitems/baseFileExplorerItem.lzx
Thu Nov 26 04:09:35 2015
@@ -115,14 +115,14 @@
Check if the user tries to move a file in its own tree,
see moveFile
-->
- <method name="checkForIsChild" args="compareFileExplorerItemId">
+ <method name="checkForIsChild" args="compFileId">
if (this.isRoot) {
return false;
} else {
- if (this.fileExplorerItemId == compareFileExplorerItemId) {
+ if (this.fileId == compFileId) {
return true;
} else {
- return
parent.parent.checkForIsChild(compareFileExplorerItemId);
+ return parent.parent.checkForIsChild(compFileId);
}
}
</method>
@@ -158,7 +158,7 @@
if ($debug) Debug.write("deleteFileOrFolder HTTP 1: ");
var downloadurl =
canvas.getUrl()+'services/FileService/deleteFileOrFolderSelf?'
+'SID='+canvas.sessionId
- +'&fileExplorerItemId='+this.fileExplorerItemId;
+ +'&fileId='+this.fileId;
this.deleteFileOrFolderSelf.setAttribute("src",downloadurl);
if ($debug) Debug.write("deleteFileOrFolderSelf doRequest
",downloadurl);
@@ -184,7 +184,7 @@
if (this.isRoot) {
return;
}
- this.addOrUpdateFolderName(this.fileExplorerItemId,false);
+ this.addOrUpdateFolderName(this.fileId,false);
</method>
<method name="doResetSingleClick" args="itmeObj">
@@ -204,8 +204,8 @@
}
if (this.isFolder) {
- if ($debug) Debug.write("NEW
this.fileExplorerItemId INTO ",this);
- if ($debug) Debug.write("NEW
this.fileExplorerItemId ",this.fileExplorerItemId);
+ if ($debug) Debug.write("NEW this.fileId INTO
",this);
+ if ($debug) Debug.write("NEW this.fileId
",this.fileId);
if (this["icon_folder_pre"]) {
this.icon_folder_pre.setAttribute("frame",2);
this.content.setAttribute("visibility","visible");
@@ -217,7 +217,7 @@
refObjListRoot:this.refObjListRoot,
fileName:canvas.getLabelName(712)
});
- t.addOrUpdateFolderName(this.fileExplorerItemId,true);
+ t.addOrUpdateFolderName(this.fileId,true);
}
}
]]>
@@ -243,7 +243,7 @@
new lz.labelerrorPopup(canvas,{errorlabelid:1462});
return;
}
- this.addOrUpdateFolderName(this.fileExplorerItemId,false);
+ this.addOrUpdateFolderName(this.fileId,false);
]]>
</method>
@@ -277,14 +277,14 @@
]]>
</method>
- <method name="addOrUpdateFolderName" args="fileExplorerItemId,isNew">
+ <method name="addOrUpdateFolderName" args="fileId,isNew">
<![CDATA[
if (!canvas.isAllowedToDraw && !canvas.ismoderator) {
new lz.labelerrorPopup(canvas,{errorlabelid:1462});
return;
}
- if ($debug) Debug.write("addOrUpdateFolderName
",fileExplorerItemId);
+ if ($debug) Debug.write("addOrUpdateFolderName ",fileId);
var tWidth = this._fileName.width;
if (tWidth < 160) {
tWidth = 160;
@@ -297,8 +297,8 @@
}
var t = new lz.dynamicFileName(canvas,{
- parentFileExplorerItemId:fileExplorerItemId,
- fileExplorerItemId:this.fileExplorerItemId,
//Only used at update Name
+ parentId:fileId,
+ fileId:this.fileId, //Only used at update Name
isOwner:this.isOwner,
text:this.fileName,
isNew:isNew, //false means its a renaming
@@ -404,7 +404,7 @@
<![CDATA[
var downloadurl =
canvas.getUrl()+'services/FileService/getFileExplorerByParentSelfInternal?'
+'SID='+canvas.sessionId
-
+'&parentFileExplorerItemId='+this.fileExplorerItemId
+ +'&parentFileExplorerItemId='+this.fileId
+'&roomId='+hib.currentroomid
+'&isOwner='+this.isOwner;
@@ -418,85 +418,13 @@
<handler name="ondata" args="d">
<![CDATA[
//if ($debug) Debug.write("ondata ",d);
+ //FIXME TODO
parent.renderFilesAndFolders(canvas.currentFileExplorer.parseParentToRoomObject(d));
]]>
</handler>
</dataset>
- <method name="renderFilesAndFolders" args="roomHome">
- <![CDATA[
- this.clearContent();
-
- // Folder area
- for (var i=0; i<roomHome.length; i++) {
- var fileExplorerItem = roomHome[i];
- if (fileExplorerItem.isFolder) {
- new lz.folderFileExplorerItem(this.content,{
- fileName:fileExplorerItem.fileName,
-
fileExplorerItemId:fileExplorerItem.fileExplorerItemId,
- fileIcon:'icon_folder_rsc',
- refObjListRoot:this.refObjListRoot
- });
- } else if (fileExplorerItem.isImage) {
- new lz.imageFileExplorerItem(this.content,{
- isFolder:false,
-
fileExplorerItemId:fileExplorerItem.fileExplorerItemId,
- fileName:fileExplorerItem.fileName,
- fileHash:fileExplorerItem.fileHash,
- isFolder:false,isImage:true,
- fileIcon:'file_explorer_image_rsc',
- refObjListRoot:this.refObjListRoot
- });
- } else if (fileExplorerItem.isPresentation) {
- new lz.documentFileExplorerItem(this.content,{
- isFolder:false,
-
fileExplorerItemId:fileExplorerItem.fileExplorerItemId,
- fileName:fileExplorerItem.fileName,
- fileHash:fileExplorerItem.fileHash,
- isFolder:false,isPresentation:true,
-
fileIcon:'file_explorer_document_rsc',
- refObjListRoot:this.refObjListRoot
- });
- } else if (fileExplorerItem.isVideo) {
- new lz.videoFileExplorerItem(this.content,{
- isFolder:false,
- isVideo:true,
-
fileExplorerItemId:fileExplorerItem.fileExplorerItemId,
- fileName:fileExplorerItem.fileName,
- fileHash:fileExplorerItem.fileHash,
- isFolder:false,isImage:true,
- fileIcon:'file_explorer_video_rsc',
-
flvHeight:fileExplorerItem.flvHeight,
- flvWidth:fileExplorerItem.flvWidth,
- refObjListRoot:this.refObjListRoot
- });
- } else if (fileExplorerItem.isStoredWmlFile) {
- new lz.wmlFileExplorerItem(this.content,{
- isFolder:false,
-
fileExplorerItemId:fileExplorerItem.fileExplorerItemId,
- fileName:fileExplorerItem.fileName,
- fileIcon:'file_explorer_wml_rsc',
- isWmlFile: true,
- refObjListRoot:this.refObjListRoot
- });
- } else if (fileExplorerItem.isChart) {
- new lz.chartFileExplorerItem(this.content,{
- isFolder:false,
-
fileExplorerItemId:fileExplorerItem.fileExplorerItemId,
- fileName:fileExplorerItem.fileName,
- fileIcon:'file_explorer_chart_rsc',
- refObjListRoot:this.refObjListRoot
- });
-
- }
- }
- ]]>
- </method>
-
-
- <view name="icon_folder_pre"
- visibility="$once{ (parent.isFolder) ? 'visible' : 'hidden' }"
- resource="icon_folder_pre_rsc" frame="1" >
+ <view name="icon_folder_pre" visibility="$once{ (parent.isFolder) ?
'visible' : 'hidden' }" resource="icon_folder_pre_rsc" frame="1" >
<handler name="onclick">
parent.toggleOpen(false);
</handler>
@@ -528,7 +456,7 @@
'&parentPath=/' + parentPath +
'&room_id=files'+
'&sid=' + canvas.sessionId +
- "&fileExplorerItemId=" + this.fileExplorerItemId;
+ "&fileId=" + this.fileId;
if ($debug) Debug.write("formatURL: ", this, downloadurl);
return downloadurl;
]]>
Modified:
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx?rev=1716565&r1=1716564&r2=1716565&view=diff
==============================================================================
---
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx
(original)
+++
openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawObject.lzx
Thu Nov 26 04:09:35 2015
@@ -173,12 +173,6 @@
<method name="addPresentationToLayer"
args="obj,urlName,nameing,posx,posy,width,height,alterModus,baseurl,fileName,moduleName,parentPath,room,domain,slideNumber,currentzoom,innerwidth,innerheight,innerx,innery,uniqueObjectSyncName,standardFileName,fullFit">
<![CDATA[
if ($debug) Debug.write("addPresentationToLayer",standardFileName);
- //only show if it is not part of wml-file-object
- //if (!this.isWmlLoaderImage) {
- // this.loadimageDataWinRef = new
lz.loadWhiteboardWindow(canvas.main_content._content.inner,{refObj:this});
- //
this.loadimageDataWinRef.setMessage(canvas.getLabelName(this.imageLoadMessageId));
- //}
- //if ($debug) Debug.write("addPresentationToLayer
uniqueObjectSyncName:",uniqueObjectSyncName,innerwidth,innerheight);
var downloadurl = canvas.getUrl() + 'DownloadHandler?' +
'fileName=' + encodeURIComponent(fileName) +
@@ -187,10 +181,6 @@
'&room_id='+room +
'&sid='+canvas.sessionId;
- //var width= this.width;
- //var height = this.height-200;
- ////Debug.write("width:height: ",width,height);
-
this.currentlayer = new
lz.swfResourceView(obj,{refObj:this,name:nameing,
x:posx,y:posy,alterModus:alterModus,
baseurl:baseurl,fileName:fileName,moduleName:moduleName,parentPath:parentPath,
@@ -201,8 +191,6 @@
innerx:innerx,innery:innery,
uniqueObjectSyncName:uniqueObjectSyncName});
- //this.parent.parent.isloadingImage.sendEvent(this.currentlayer);
- ////Debug.write("downloadurl. ",downloadurl);
this.currentlayer._swfView.setSource(downloadurl);
this.addItemToDocumentToolBar();
@@ -210,44 +198,6 @@
]]>
</method>
- <!--
- TODO: check Recording
-
- <method name="addPresentationToLayerRecording"
args="obj,urlName,nameing,posx,posy,width,height,alterModus,baseurl,fileName,moduleName,parentPath,room,domain,slideNumber,currentzoom,innerwidth,innerheight,innerx,innery">
- <![CDATA[
-
//Debug.write("addPresentationToLayer",obj,nameing,posx,posy,width,height,alterModus,baseurl,fileName,moduleName,parentPath,room,domain,slideNumber);
- //only show if it is not part of wml-file-object
- if (!this.isWmlLoaderImage) {
- this.loadimageDataWinRef = new
lz.loadWhiteboardWindow(canvas.main_content._content.inner,{refObj:this});
-
this.loadimageDataWinRef.setMessage(canvas.getLabelName(this.imageLoadMessageId));
- }
- var downloadurl = canvas.getUrl()+'DownloadHandler?' +
- 'fileName=' + encodeURIComponent(fileName) +
- '&moduleName=' + moduleName +
- '&parentPath=' + encodeURIComponent(parentPath) +
- '&room_id='+room +
- '&sid='+canvas.sessionId;
- var width= this.width;
- var height = this.height;
-
- this.currentlayer = new
lz.swfResourceView(obj,{refObj:this,name:nameing,
- x:posx,y:posy,
- alterModus:alterModus,
- baseurl:baseurl,fileName:fileName,moduleName:moduleName,
- parentPath:parentPath,room:room,domain:domain,
- slideNumber:slideNumber,width:width,height:height,
-
currentzoom:currentzoom,innerwidth:innerwidth,innerheight:innerheight,
- innerx:innerx,innery:innery,recorderModus:true});
-
- this.parent.parent.isloadingImage.sendEvent(this.currentlayer);
- this.currentlayer._swfView.setSource(downloadurl);
-
- //Add Layer to global Layer
- return this.currentlayer;
- ]]>
- </method>
- -->
-
<method name="addSWFToLayerHistory" args="actionObject,refObj,isWmlLoader">
this.isWmlLoaderImage = isWmlLoader;
this.baseactionobjectList.push(actionObject);
@@ -293,16 +243,6 @@
actionObject[9],actionObject[10],actionObject[17],actionObject[18],actionObject[19]);
</method>
- <!--
- TODO: Check Recording Process
-
- <method name="addSWFToLayerHistoryRecording"
args="actionObject,refObj,isWmlLoader">
- this.isWmlLoaderImage = isWmlLoader;
- this.baseactionobjectList.push(actionObject);
-
this.addPresentationToLayerRecording(refObj,actionObject[1],actionObject[actionObject.length-1],actionObject[actionObject.length-5],actionObject[actionObject.length-4],actionObject[actionObject.length-3],actionObject[actionObject.length-2],false,actionObject[2],actionObject[3],actionObject[4],actionObject[5],actionObject[6],actionObject[7],actionObject[8],actionObject[16],actionObject[11],actionObject[12],actionObject[9],actionObject[10]);
- </method>
- -->
-
<method name="registerNewSWF"
args="urlname,posx,posy,width,height,baseurl,fileName,moduleName,parentPath,room,domain,slideNumber,innerx,innery,innerwidth,innerheight,zoomlevel,currentzoom,initwidth,initheight,uniquObjectSyncName,doUpdateMessage,standardFileName,fullFit,zIndex">
var actionObject = new Array();
actionObject.push('swf');//0
@@ -372,45 +312,6 @@
this.sendCompletedObjectSyncEvent.doCall();
</method>
-
-
- <!-- sending messages/notifications of sync process
- syncing is now on server side implemented, swagner 12.06.2008
- <netRemoteCallHib name="sendMessageWithClientSWF"
funcname="sendMessageWithClient" remotecontext="$once{ canvas.thishib }" >
- <netparam name="vars"><method name="getValue">return
parent.parent.imageLoadingCompleteMessage;</method></netparam>
- <handler name="ondata" args="value">
- <![CDATA[
- //The onResult-Handler will be called be the
rtmpconnection
- ////Debug.write("getValue : ",value);
- ]]>
- </handler>
- </netRemoteCallHib>
- -->
-
- <!-- get list of clients before loading image cause
- we have to show the sync process
-
- syncing is now on server side implemented, swagner 12.06.2008
-
- <netRemoteCallHib name="getSWFClientListScope"
funcname="getClientListScope" remotecontext="$once{ canvas.thishib }" >
- <handler name="ondata" args="value">
- <![CDATA[
- //The onResult-Handler will be called by the
rtmpconnection
- ////Debug.write("getSWFClientListScope
Instance: ",value);
- parent._loadingUsersImageList = new Array();
- for (var eg in value){
- if (canvas.streamid !=
value[eg].streamid){
-
//Debug.write("parent._loadingUsersImageList value eg ",eg,value[eg]);
-
parent._loadingUsersImageList.push(value[eg]);
- }
- }
- this.parent.doRegisterNewSwf();
- this.parent.startSWFsyncCheck();
- ]]>
- </handler>
- </netRemoteCallHib>
- -->
-
<method name="doRegisterNewSwf" args="doUpdateMessage">
//now send notifications to connected clients
this.setAttribute('drawmodus','hand');
@@ -434,23 +335,6 @@
this.setModus('swf');
</method>
- <!-- after loading the objects check if all connected clients of that
conference
- have loaded the file completely, check it every 1 seconds
- syncing is now on server side implemented, swagner 12.06.2008
- <method name="startSWFsyncCheck">
- <![CDATA[
- if (this._loadingUsersImageList.length==0){
- this.sendSyncNotificationSWF();
- } else {
- var txt = this.imageSyncMessageText+'
'+this._loadingUsersImageList.length;
- this.loadimageDataWinRef.setMessage(txt);
- this.loadImageObjectTimer = new LzDelegate(
this, "startImgaesyncCheck" );
- lz.Timer.addTimer( this.loadImageObjectTimer,
this.syncImageCheckTime );
- }
- ]]>
- </method>
- -->
-
<method name="sendSyncNotificationSWF">
this.imageLoadingCompleteMessage = new Array();
this.imageLoadingCompleteMessage[0] = "whiteboard";
@@ -458,48 +342,6 @@
this.sendMessageWithClientSWF.doCall();
</method>
- <!-- invoked by remote client once he has completely loaded the
wml-file
- remote client is waiting/still shows loading window untill all
clients have
- completely loaded the object/moderator sends "synccomplete"
message
-
- syncing is now on server side implemented, swagner 12.06.2008
-
- <method name="sendCompleteSWFLoadedRClient" args="client">
- <![CDATA[
- //detect self messageing
- if (client.streamid!=canvas.streamid){
- //remove client from sync list
- for (var
i=0;i<this._loadingUsersImageList.length;i++){
- if
(this._loadingUsersImageList[i].streamid==client.streamid){
- ////Debug.write("deleteing
client from list: ",this._loadingUsersImageList[i].streamid);
-
this._loadingUsersImageList.splice(i,1);
- }
- }
- }
- ]]>
- </method>
-
- -->
-
- <!-- invoked remotely by Moderator
- all clients have succeed in loading the image
- loading win can be closed
- Alert: This notification will be send from Moderator and
received by ALL clients INCLUDING
- the moderator, so the moderator needs no extra command *close*
for loading bar cause he
- gets its own *sync* complete nofification
-
- syncing is now on server side implemented, swagner 12.06.2008
-
- <method name="sendCompleteSWFSync" args="client">
- ////Debug.write("sendCompleteSWFSync ",client);
- this.loadimageDataWinRef.close();
- </method>
- -->
-
- <!-- Document actions
- this.ObjectByName is set by the method doShowObjectBounds of baseDraw
and holds a reference to
- the currently selected object on the whiteboard
- -->
<method name="doDocumentAction" args="action">
<![CDATA[
if ($debug) Debug.info("doDocumentAction :1: sendCurrentSWFObject
",action);
@@ -741,16 +583,16 @@
- <method name="playVideoSynced"
args="fileExplorerItemId,fileName,flv_width,flv_height">
+ <method name="playVideoSynced" args="fileId,fileName,flv_width,flv_height">
<![CDATA[
- if ($debug) Debug.write("playVideoSynced :
",fileExplorerItemId,fileName,flv_width,flv_height);
+ if ($debug) Debug.write("playVideoSynced : ",
fileId,fileName,flv_width,flv_height);
var tName = 'flv'+this.getCounter();
this.currentlayer = new lz.whiteboardVideoPlayer(this,{
name:tName,
-
fileExplorerItemId:fileExplorerItemId,
+ fileId: fileId,
title:fileName,
sendInit:true,
flv_width:flv_width,
@@ -764,10 +606,10 @@
<method name="sendNewVideoRemote" args="refObj">
<![CDATA[
- if ($debug) Debug.write("sendNewVideoRemote :
",refObj.fileExplorerItemId,refObj.title);
+ if ($debug) Debug.write("sendNewVideoRemote :
",refObj.fileId,refObj.title);
this.flvregisterFinal(refObj.name,refObj.x,refObj.y,refObj.width,refObj.height,
-
refObj.fileExplorerItemId,refObj.title,
+ refObj.fileId,refObj.title,
false, //isPlaying
refObj.flv_width,
refObj.flv_height,
@@ -777,10 +619,10 @@
]]>
</method>
- <method name="flvregisterFinal"
args="newName,x,y,width,height,fileExplorerItemId,fileName,isPlaying,flv_width,flv_height,zIndex">
+ <method name="flvregisterFinal"
args="newName,x,y,width,height,fileId,fileName,isPlaying,flv_width,flv_height,zIndex">
var actionObject = new Array();
actionObject[0] = 'flv';
- actionObject[1] = fileExplorerItemId;
+ actionObject[1] = fileId;
actionObject[2] = fileName;
actionObject[3] = isPlaying;
actionObject[4] = flv_width;
@@ -804,7 +646,7 @@
this.currentlayer = new lz.whiteboardVideoPlayer(this,{
name:lastActionObject[lastActionObject.length-1],
-
fileExplorerItemId:lastActionObject[1],
+ fileId:lastActionObject[1],
title:lastActionObject[2],
flv_width:lastActionObject[4],
flv_height:lastActionObject[5]
@@ -818,12 +660,6 @@
]]>
</method>
- <!--
- x:lastActionObject[lastActionObject.length-5],
- y:lastActionObject[lastActionObject.length-4],
- width:lastActionObject[lastActionObject.length-3],
- height:lastActionObject[lastActionObject.length-2]
- -->
<method name="playFLV" args="refObj,play">
<