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 2015/11/25 14:30:45 UTC
svn commit: r1716393 - in
/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer:
dragItemFileExplorer.lzx dynamicFileName.lzx fileExplorer.lzx
treeitems/baseFileExplorerItem.lzx
Author: solomax
Date: Wed Nov 25 13:30:45 2015
New Revision: 1716393
URL: http://svn.apache.org/viewvc?rev=1716393&view=rev
Log:
[OPENMEETINGS-1279] file tree fixing is started
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/treeitems/baseFileExplorerItem.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=1716393&r1=1716392&r2=1716393&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 Wed Nov 25 13:30:45 2015
@@ -151,7 +151,6 @@
<method name="deleteFileOrFolder">
<![CDATA[
if ($debug) Debug.write("deleteFileOrFolder HTTP 2: ");
- //this.getFileExplorerByRoom.doCall();
var downloadurl = canvas.getUrl()+'services/FileService/deleteFileOrFolderSelf?'
+'SID='+canvas.sessionId
+'&fileExplorerItemId='+this.fileExplorerItemId;
@@ -195,7 +194,6 @@
<method name="moveFile">
<![CDATA[
if ($debug) Debug.write("moveFile HTTP 1: ");
- //this.getFileExplorerByRoom.doCall();
var downloadurl = canvas.getUrl()+'services/FileService/moveFileSelfInternal?'
+'SID='+canvas.sessionId
+'&fileExplorerItemId='+this.fileExplorerItemId
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=1716393&r1=1716392&r2=1716393&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 Wed Nov 25 13:30:45 2015
@@ -59,7 +59,6 @@
<method name="addFolder">
<![CDATA[
if ($debug) Debug.write("moveFile HTTP 1: ");
- //this.getFileExplorerByRoom.doCall();
var downloadurl = canvas.getUrl()+'services/FileService/addFolderSelfInternal?'
+'SID='+canvas.sessionId
+'&parentFileExplorerItemId='+this.parentFileExplorerItemId
@@ -105,7 +104,6 @@
<method name="updateFileOrFolderName">
<![CDATA[
if ($debug) Debug.write("moveFile HTTP 1: ");
- //this.getFileExplorerByRoom.doCall();
var downloadurl = canvas.getUrl()+'services/FileService/updateFileOrFolderNameSelf?'
+'SID='+canvas.sessionId
+'&fileExplorerItemId='+this.fileExplorerItemId
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=1716393&r1=1716392&r2=1716393&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 Wed Nov 25 13:30:45 2015
@@ -167,17 +167,16 @@
<method name="loadFiles">
<![CDATA[
- if ($debug) Debug.write("loadFiles ");
+ var url = canvas.getUrl() + 'services/file/room/' + hib.currentroomid;
+ if ($debug) Debug.write("loadFiles ", url);
var requestor:URLLoader = new URLLoader();
- var request:URLRequest = new URLRequest("http://service.example.com/");
+ var request:URLRequest = new URLRequest(url);
request.method = URLRequestMethod.GET;
//Add the URL variables
var variables:URLVariables = new URLVariables();
- variables.method = "test.echo";
- variables.api_key = "123456ABC";
- variables.message = "Able was I, ere I saw Elba.";
+ variables.sid = canvas.sessionId;
request.data = variables;
//Initiate the transaction
@@ -185,26 +184,20 @@
requestor.addEventListener(Event.COMPLETE, httpRequestComplete);
requestor.addEventListener("ioError", httpRequestError);//IOErrorEvent.IOERROR
requestor.addEventListener(SecurityErrorEvent.SECURITY_ERROR, httpRequestError);
- requestor.load( request );
-
- /* FIXME TODO
- //this.getFileExplorerByRoom.doCall();
- var downloadurl = canvas.getUrl()+'services/FileService/getFileExplorerByRoomSelfInternal?'
- +'SID='+canvas.sessionId
- +'&roomId='+hib.currentroomid;
-
- if ($debug) Debug.write("getFileExplorerByRoomSelf doRequest 1 ",downloadurl);
- this.getFileExplorerByRoomSelf.setAttribute("src",downloadurl);
- if ($debug) Debug.write("loadFiles ", this);
- this.getFileExplorerByRoomSelf.doRequest();
- */
+ requestor.load(request);
]]>
</method>
<method name="httpRequestComplete" args="event">
+ if ($debug) Debug.info("httpRequestComplete ", event);
+ if ($debug) Debug.info("httpRequestComplete ", event.target.data);
+ var o = JSON.parse(event.target.data);
+ if ($debug) Debug.info("httpRequestComplete ", o);
+ parent.createRootItems(o.fileExplorerObject);
</method>
<method name="httpRequestError" args="event">
+ if ($debug) Debug.error("httpRequestError ", event);
</method>
<method name="parseParentToRoomObject" args="dObj">
@@ -226,42 +219,6 @@
]]>
</method>
- <method name="parseRootToRoomObject" args="dObj">
- <![CDATA[
-
- var roomObject = new Object();
-
- roomObject.userHome = new Array();
- roomObject.roomHome = new Array();
- roomObject.userHomeSize = 0;
- roomObject.roomHomeSize = 0;
-
- var tFiles = dObj.childNodes[0].childNodes[0].childNodes;
-
- //if ($debug) Debug.write("tFiles ",tFiles);
-
- for (var i=0;i<tFiles.length;i++) {
-
- //if ($debug) Debug.write("nodeName",tFiles[i].nodeName);
-
- if (tFiles[i].nodeName == "userHomeSize") {
- if ($debug) Debug.write("roomHomeSize",tFiles[i].childNodes[0].data);
- roomObject.userHomeSize = Number(tFiles[i].childNodes[0].data);
- } else if (tFiles[i].nodeName == "roomHomeSize") {
- if ($debug) Debug.write("roomHomeSize",tFiles[i].childNodes[0].data);
- roomObject.roomHomeSize = Number(tFiles[i].childNodes[0].data);
- } else if (tFiles[i].nodeName == "roomHome") {
- roomObject.roomHome.push(this.parseToFileObj(tFiles[i].childNodes));
- } else if (tFiles[i].nodeName == "userHome") {
- roomObject.userHome.push(this.parseToFileObj(tFiles[i].childNodes));
- }
-
- }
-
- return roomObject;
- ]]>
- </method>
-
<method name="parseToFileObj" args="dObj">
<![CDATA[
@@ -353,7 +310,7 @@
<!--
Parse Items and generate Output
-->
- <method name="parseRootItems" args="roomObject">
+ <method name="createRootItems" args="roomObject">
<![CDATA[
this.clearContent();
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=1716393&r1=1716392&r2=1716393&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 Wed Nov 25 13:30:45 2015
@@ -156,7 +156,6 @@
}
if ($debug) Debug.write("deleteFileOrFolder HTTP 1: ");
- //this.getFileExplorerByRoom.doCall();
var downloadurl = canvas.getUrl()+'services/FileService/deleteFileOrFolderSelf?'
+'SID='+canvas.sessionId
+'&fileExplorerItemId='+this.fileExplorerItemId;
@@ -403,7 +402,6 @@
<method name="loadFiles">
<![CDATA[
- //this.getFileExplorerByRoom.doCall();
var downloadurl = canvas.getUrl()+'services/FileService/getFileExplorerByParentSelfInternal?'
+'SID='+canvas.sessionId
+'&parentFileExplorerItemId='+this.fileExplorerItemId
@@ -425,25 +423,6 @@
</handler>
</dataset>
- <!--
- parent.parseRootItems(canvas.currentFileExplorer.parseToRoomObject(d));
- -->
- <!--
- public List<FileExplorerItem> getFileExplorerByParent(String SID, Long parentFileExplorerItemId,
- Long room_id, Boolean isOwner) {
- <netRemoteCallHib name="getFileExplorerByParent" funcname="fileservice.getFileExplorerByParent"
- 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 hib.currentroomid;</method></netparam>
- <netparam><method name="getValue">return parent.parent.isOwner;</method></netparam>
- <handler name="ondata" args="value">
- if ($debug) Debug.write("getFileExplorerByParent: ",value);
- parent.renderFilesAndFolders(value);
- </handler>
- </netRemoteCallHib>
- -->
-
<method name="renderFilesAndFolders" args="roomHome">
<![CDATA[
this.clearContent();