Author: vdegtyarev
Date: Tue Sep 24 07:50:51 2013
New Revision: 1525808
URL: http://svn.apache.org/r1525808
Log:
OPENMEETINGS-803 is fixed. Image file is visible for attendees.
Modified:
openmeetings/branches/2.x/WebContent/src/modules/conference/whiteboard/base/baseDrawImage.lzx
Modified:
openmeetings/branches/2.x/WebContent/src/modules/conference/whiteboard/base/baseDrawImage.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/2.x/WebContent/src/modules/conference/whiteboard/base/baseDrawImage.lzx?rev=1525808&r1=1525807&r2=1525808&view=diff
==============================================================================
---
openmeetings/branches/2.x/WebContent/src/modules/conference/whiteboard/base/baseDrawImage.lzx
(original)
+++
openmeetings/branches/2.x/WebContent/src/modules/conference/whiteboard/base/baseDrawImage.lzx
Tue Sep 24 07:50:51 2013
@@ -39,7 +39,7 @@
<!-- invoked by clicking on the confirmation dialog after
clicking on an image in the Library -->
<method name="addNewSyncImage"
args="urlname,posx,posy,baseurl,fileName,moduleName,parentPath,room,domain">
- if ($debug) Debug.write("urlname: ",urlname);
+ if ($debug) Debug.write("urlname: ",canvas.getUrl());
var now = new Date();
//This invokes a Method which is in the remoteWhiteboard.lzx
this.startNewObjectSyncProcess.isStarting = true;
@@ -76,7 +76,8 @@
//if ($debug) Debug.write("addImageToLayer
",obj,nameing,urlname,posx,posy,width,height,alterModus,baseurl,fileName,moduleName,parentPath,room,domain);
//if ($debug) Debug.write("addImageToLayer posx ",posx);
- var src = baseurl+'?fileName=' +
encodeURIComponent(fileName) +
+ if ($debug) Debug.write("addImageToLayer urlname : ",
canvas.getUrl() + 'DownloadHandler');
+ var src = canvas.getUrl() + 'DownloadHandler' +
'?fileName=' + encodeURIComponent(fileName) +
'&moduleName=' + moduleName +
'&parentPath=' + encodeURIComponent(parentPath)
+
'&room_id=' + room +