Author: solomax
Date: Thu Mar 16 04:13:20 2017
New Revision: 1787118
URL: http://svn.apache.org/viewvc?rev=1787118&view=rev
Log:
[OPENMEETINGS-1600] image upload is fixed
Modified:
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/base/imageForDrawView.lzx
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=1787118&r1=1787117&r2=1787118&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 Mar 16 04:13:20 2017
@@ -66,7 +66,7 @@
<![CDATA[
if ($debug) Debug.write("addImageToLayer ",urlname);
- var downloadurl = canvas.getUrl() + urlname + "?uid=" +
canvas.publicSID;
+ var downloadurl = canvas.getUrl() + urlname + "&uid=" +
canvas.publicSID;
if ($debug) Debug.write("addImageToLayer urlname : ",
downloadurl);
if ($debug) Debug.write("alterModus: ",alterModus);
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/imageForDrawView.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/imageForDrawView.lzx?rev=1787118&r1=1787117&r2=1787118&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/imageForDrawView.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/imageForDrawView.lzx
Thu Mar 16 04:13:20 2017
@@ -7,41 +7,41 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
+
-->
<library>
<class name="imageForDrawView" extends="omImage" stretches="both">
<event name="prepareForDelete" />
-
+
<attribute name="downloadurl" value="" type="string" />
-
+
<attribute name="alterModus" value="true" type="boolean" />
<attribute name="isLocalSync" value="false" type="boolean" />
-
+
<attribute name="recorderModus" value="false" type="boolean" />
-
+
<attribute name="baseurl" value="" type="string" />
<attribute name="fileName" value="" type="string" />
<attribute name="moduleName" value="" type="string" />
<attribute name="parentPath" value="" type="string" />
<attribute name="room" value="" type="string" />
<attribute name="domain" value="" type="string" />
-
+
<attribute name="remotewidth" value="0" type="number" />
<attribute name="remoteheight" value="0" type="number" />
-
+
<attribute name="typeOfObject" value="image" type="string" />
-
+
<!-- holds the reference_id to the SyncProcess -->
<attribute name="uniqueObjectSyncName" value="" type="string" />
<attribute name="refObj" value="null" />
@@ -49,12 +49,12 @@
<method name="completeCallback" args="event">
if ($debug) Debug.info("imageForDrawView::OVERRIDEN
completeCallback");
</method>
-
+
<handler name="onload">
<![CDATA[
if ($debug) Debug.info("imageForDrawView::onload image loaded");
//this.refObj.parent._loading.setAttribute('visible',false);
-
+
if (this.remotewidth != 0 && this.remoteheight != 0){
this.setAttribute('width',this.remotewidth);
this.setAttribute('height',this.remoteheight);
@@ -91,10 +91,10 @@
} else {
this.refObj.sendLoadNotificationImage(this);
}
- this.refObj.layers.push(this);
+ this.refObj.layers.push(this);
]]>
</handler>
-
+
<handler name="onerror" args="error">
<![CDATA[
if ($debug) Debug.write("imageForDrawView::onerror ", error);
@@ -109,15 +109,15 @@
} else {
this.refObj.sendLoadNotificationImage(this);
}
- this.refObj.layers.push(this);
-
+ this.refObj.layers.push(this);
+
this.oninit.sendEvent();
-
+
//This is not needed anymore as it sync's against the server
sid, swagner, 11.06.2008
this.refObj.parent.parent.isloadedImage.sendEvent(this);
]]>
</handler>
-
+
<handler name="ontimeout" args="error">
<![CDATA[
if ($debug) Debug.write("imageForDrawView::ontimeout ", error);
@@ -132,14 +132,14 @@
} else {
this.refObj.sendLoadNotificationImage(this);
}
- this.refObj.layers.push(this);
-
+ this.refObj.layers.push(this);
+
this.oninit.sendEvent();
-
+
//This is not needed anymore as it sync's against the server
sid, swagner, 11.06.2008
this.refObj.parent.parent.isloadedImage.sendEvent(this);
]]>
- </handler>
+ </handler>
</class>
</library>
