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 2016/11/03 16:36:24 UTC
svn commit: r1767927 - in /openmeetings/application/branches:
3.1.x/openmeetings-flash/src/main/swf/base/components/upload/
3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/treeitems/
3.1.x/openmeetings-flash/src/main/sw...
Author: solomax
Date: Thu Nov 3 16:36:24 2016
New Revision: 1767927
URL: http://svn.apache.org/viewvc?rev=1767927&view=rev
Log:
[OPENMEETINGS-1500] drag-n-drop to WB is fixed
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/upload/uploadWindowExplorer.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/treeitems/imageFileExplorerItem.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawImage.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawImage.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/upload/uploadWindowExplorer.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/upload/uploadWindowExplorer.lzx?rev=1767927&r1=1767926&r2=1767927&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/upload/uploadWindowExplorer.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/base/components/upload/uploadWindowExplorer.lzx Thu Nov 3 16:36:24 2016
@@ -66,8 +66,8 @@
if ($debug) Debug.write(url);
canvas._drawarea.loadSWFPresentationSynced(url,tArrayValueObj.fileHash + ".swf",
- "videoconf1",uploadmoduleimgfolderVar,"files",hib.conferencedomain,1,
- tArrayValueObj.fileSystemName);
+ "videoconf1",uploadmoduleimgfolderVar,"files",hib.conferencedomain,1,
+ tArrayValueObj.fileSystemName);
} else if (tArrayValueObj.isImage) {
canvas._drawarea.parent.parent.clearAreaAndAddImage(this.generateFileLink(tArrayValueObj.fileHash),0,0,
canvas.getUrl() +'DownloadHandler',
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/treeitems/imageFileExplorerItem.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/treeitems/imageFileExplorerItem.lzx?rev=1767927&r1=1767926&r2=1767927&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/treeitems/imageFileExplorerItem.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/tabcontent/fileexplorer/treeitems/imageFileExplorerItem.lzx Thu Nov 3 16:36:24 2016
@@ -35,16 +35,17 @@
<method name="loadImageToWhiteboard">
if (canvas.ismoderator || canvas.isAllowedToDraw) {
- var mouse_x = canvas._drawarea.getMouse("x");
- var mouse_y = canvas._drawarea.getMouse("y");
- canvas._drawarea.parent.parent.clearAreaAndAddImage(this.generateFileLink(),mouse_x,mouse_y,
- canvas.getUrl()+'DownloadHandler',
- this.fileHash,"videoconf1","/","files",hib.conferencedomain);
+ var mouse_x = canvas._drawarea.getMouse("x");
+ var mouse_y = canvas._drawarea.getMouse("y");
+ canvas._drawarea.parent.parent.clearAreaAndAddImage(
+ this.generateFileLink(), mouse_x, mouse_y,
+ canvas.getUrl() + 'DownloadHandler',
+ this.fileHash, "videoconf1", "/", "files", hib.conferencedomain);
} else {
- new lz.errorModeratorPopup(canvas,{error:canvas.getLabelName(721)});
- }
+ new lz.errorModeratorPopup(canvas,{error:canvas.getLabelName(721)});
+ }
</method>
-
+
<text name="_fileName" x="36" text="${ parent.fileName }" fontsize="10" resize="true" y="1">
<contextmenu>
<contextmenuitem caption="$once{ canvas.getLabelName(711) }" onselect="parent.parent.parent.editFolderName()" />
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawImage.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawImage.lzx?rev=1767927&r1=1767926&r2=1767927&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawImage.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawImage.lzx Thu Nov 3 16:36:24 2016
@@ -51,7 +51,7 @@
</method>
<!-- standard add Function -->
- <method name="addNewImage" args="urlname,posx,posy,baseurl,fileName,moduleName,parentPath,room,domain,uniqueObjectSyncName,isLocalSync">
+ <method name="addNewImage" args="urlname, posx, posy, baseurl, fileName, moduleName, parentPath, room, domain, uniqueObjectSyncName, isLocalSync">
if ($debug) Debug.write("urlname posx: ",urlname,posx);
this.addImageToLayer(this,'image'+this.getCounter(),urlname,
posx,posy,0,0,
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx?rev=1767927&r1=1767926&r2=1767927&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx Thu Nov 3 16:36:24 2016
@@ -103,36 +103,37 @@
g["image"]["askagainclear"]=true;
canvas.setUserData(g);
</method>
-
- <method name="clearAreaAndAddImage" args="downloadurlVal,xVal,yVal,baseurl,fileName,moduleName,parentPath,room,domain">
- <![CDATA[
- ////Debug.write("clearAreaAndAddImage: ",downloadurlVal,xVal,yVal,baseurl,fileName,moduleName,parentPath,room,domain);
- this.downloadurl=downloadurlVal;
- this.iamgex=xVal;
- this.imagey=yVal;
- this.baseurl=baseurl;
- this.fileName=fileName;
- this.moduleName=moduleName;
- this.parentPath=parentPath;
- this.room=room;
- this.domain=domain;
- var storedImageDate = this.getconfirmationscode();
- ////Debug.write(" g[image] ",storedImageDate);
- if (storedImageDate["clearField"] && !storedImageDate["askagainclear"]){
- canvas._drawarea.setModus('plain');
- if ($debug) Debug.write(" canvas._drawarea.addNewImage 1 ",this.downloadurl,this.x,this.y);
- canvas._drawarea.addNewImage(this.downloadurl,this.x,this.y,this.baseurl,this.fileName,this.moduleName,this.parentPath,this.room,this.domain);
- } else if (!storedImageDate["askagainclear"] && !storedImageDate["clearField"]){
- canvas._drawarea.addNewImage(this.downloadurl,this.x,this.y,this.baseurl,this.fileName,this.moduleName,this.parentPath,this.room,this.domain);
- if ($debug) Debug.write(" canvas._drawarea.addNewImage 2 ",this.downloadurl,this.x,this.y);
- } else if (storedImageDate["askagainclear"]){
- this.confirmdialog = new lz.confirmationBox(canvas.main_content._content.inner,{labelid:62,labeliderror:63,refObj:this});
- } else {
- this.confirmdialog = new lz.confirmationBox(canvas.main_content._content.inner,{labelid:62,labeliderror:63,refObj:this});
- }
- ]]>
- </method>
-
+
+ <method name="clearAreaAndAddImage" args="downloadurlVal,xVal,yVal,baseurl,fileName,moduleName,parentPath,room,domain">
+ <![CDATA[
+ //if ($debug) Debug.write("clearAreaAndAddImage: ", downloadurlVal, xVal, yVal, baseurl, fileName, moduleName, parentPath, room, domain);
+ this.downloadurl = downloadurlVal;
+ this.iamgex = xVal;
+ this.imagey = yVal;
+ this.baseurl = baseurl;
+ this.fileName = fileName;
+ this.moduleName = moduleName;
+ this.parentPath = parentPath;
+ this.room = room;
+ this.domain = domain;
+ var storedImageDate = this.getconfirmationscode();
+ //if ($debug) Debug.write("clearAreaAndAddImage storedImageDate = ", storedImageDate);
+ if (storedImageDate["clearField"] && !storedImageDate["askagainclear"]){
+ canvas._drawarea.setModus('plain');
+ canvas._drawarea.addNewImage(this.downloadurl, this.x, this.y, this.baseurl, this.fileName, this.moduleName, this.parentPath, this.room, this.domain, fileName, false);
+ } else if (!storedImageDate["askagainclear"] && !storedImageDate["clearField"]){
+ if ($debug) Debug.write(" canvas._drawarea.addNewImage 2 ", this.downloadurl, this.x, this.y);
+ canvas._drawarea.addNewImage(this.downloadurl, this.x, this.y, this.baseurl, this.fileName, this.moduleName, this.parentPath, this.room, this.domain, fileName, false);
+ } else if (storedImageDate["askagainclear"]){
+ if ($debug) Debug.write("clearAreaAndAddImage confirmdialog 1 ");
+ this.confirmdialog = new lz.confirmationBox(canvas.main_content._content.inner,{labelid:62,labeliderror:63,refObj:this});
+ } else {
+ if ($debug) Debug.write("clearAreaAndAddImage confirmdialog 2 ");
+ this.confirmdialog = new lz.confirmationBox(canvas.main_content._content.inner,{labelid:62,labeliderror:63,refObj:this});
+ }
+ ]]>
+ </method>
+
<event name="isloadingImage" />
<event name="isloadedImage" />
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawImage.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawImage.lzx?rev=1767927&r1=1767926&r2=1767927&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawImage.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawImage.lzx Thu Nov 3 16:36:24 2016
@@ -51,7 +51,7 @@
</method>
<!-- standard add Function -->
- <method name="addNewImage" args="urlname,posx,posy,baseurl,fileName,moduleName,parentPath,room,domain,uniqueObjectSyncName,isLocalSync">
+ <method name="addNewImage" args="urlname, posx, posy, baseurl, fileName, moduleName, parentPath, room, domain, uniqueObjectSyncName, isLocalSync">
if ($debug) Debug.write("urlname posx: ",urlname,posx);
this.addImageToLayer(this,'image'+this.getCounter(),urlname,
posx,posy,0,0,
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx?rev=1767927&r1=1767926&r2=1767927&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/fixedFileExplorerWhiteBoard.lzx Thu Nov 3 16:36:24 2016
@@ -103,36 +103,37 @@
g["image"]["askagainclear"]=true;
canvas.setUserData(g);
</method>
-
- <method name="clearAreaAndAddImage" args="downloadurlVal,xVal,yVal,baseurl,fileName,moduleName,parentPath,room,domain">
- <![CDATA[
- ////Debug.write("clearAreaAndAddImage: ",downloadurlVal,xVal,yVal,baseurl,fileName,moduleName,parentPath,room,domain);
- this.downloadurl=downloadurlVal;
- this.iamgex=xVal;
- this.imagey=yVal;
- this.baseurl=baseurl;
- this.fileName=fileName;
- this.moduleName=moduleName;
- this.parentPath=parentPath;
- this.room=room;
- this.domain=domain;
- var storedImageDate = this.getconfirmationscode();
- ////Debug.write(" g[image] ",storedImageDate);
- if (storedImageDate["clearField"] && !storedImageDate["askagainclear"]){
- canvas._drawarea.setModus('plain');
- if ($debug) Debug.write(" canvas._drawarea.addNewImage 1 ",this.downloadurl,this.x,this.y);
- canvas._drawarea.addNewImage(this.downloadurl,this.x,this.y,this.baseurl,this.fileName,this.moduleName,this.parentPath,this.room,this.domain);
- } else if (!storedImageDate["askagainclear"] && !storedImageDate["clearField"]){
- canvas._drawarea.addNewImage(this.downloadurl,this.x,this.y,this.baseurl,this.fileName,this.moduleName,this.parentPath,this.room,this.domain);
- if ($debug) Debug.write(" canvas._drawarea.addNewImage 2 ",this.downloadurl,this.x,this.y);
- } else if (storedImageDate["askagainclear"]){
- this.confirmdialog = new lz.confirmationBox(canvas.main_content._content.inner,{labelid:62,labeliderror:63,refObj:this});
- } else {
- this.confirmdialog = new lz.confirmationBox(canvas.main_content._content.inner,{labelid:62,labeliderror:63,refObj:this});
- }
- ]]>
- </method>
-
+
+ <method name="clearAreaAndAddImage" args="downloadurlVal,xVal,yVal,baseurl,fileName,moduleName,parentPath,room,domain">
+ <![CDATA[
+ //if ($debug) Debug.write("clearAreaAndAddImage: ", downloadurlVal, xVal, yVal, baseurl, fileName, moduleName, parentPath, room, domain);
+ this.downloadurl = downloadurlVal;
+ this.iamgex = xVal;
+ this.imagey = yVal;
+ this.baseurl = baseurl;
+ this.fileName = fileName;
+ this.moduleName = moduleName;
+ this.parentPath = parentPath;
+ this.room = room;
+ this.domain = domain;
+ var storedImageDate = this.getconfirmationscode();
+ //if ($debug) Debug.write("clearAreaAndAddImage storedImageDate = ", storedImageDate);
+ if (storedImageDate["clearField"] && !storedImageDate["askagainclear"]){
+ canvas._drawarea.setModus('plain');
+ canvas._drawarea.addNewImage(this.downloadurl, this.x, this.y, this.baseurl, this.fileName, this.moduleName, this.parentPath, this.room, this.domain, fileName, false);
+ } else if (!storedImageDate["askagainclear"] && !storedImageDate["clearField"]){
+ if ($debug) Debug.write(" canvas._drawarea.addNewImage 2 ", this.downloadurl, this.x, this.y);
+ canvas._drawarea.addNewImage(this.downloadurl, this.x, this.y, this.baseurl, this.fileName, this.moduleName, this.parentPath, this.room, this.domain, fileName, false);
+ } else if (storedImageDate["askagainclear"]){
+ if ($debug) Debug.write("clearAreaAndAddImage confirmdialog 1 ");
+ this.confirmdialog = new lz.confirmationBox(canvas.main_content._content.inner,{labelid:62,labeliderror:63,refObj:this});
+ } else {
+ if ($debug) Debug.write("clearAreaAndAddImage confirmdialog 2 ");
+ this.confirmdialog = new lz.confirmationBox(canvas.main_content._content.inner,{labelid:62,labeliderror:63,refObj:this});
+ }
+ ]]>
+ </method>
+
<event name="isloadingImage" />
<event name="isloadedImage" />