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 2017/05/01 06:08:53 UTC
[07/50] [abbrv] openmeetings git commit: [OPENMEETINGS-1600] image
upload is fixed
[OPENMEETINGS-1600] image upload is fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/5d4504e1
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/5d4504e1
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/5d4504e1
Branch: refs/heads/3.2.x
Commit: 5d4504e153359c4d5ed57ff42f5e39afd102d713
Parents: dc705d0
Author: Maxim Solodovnik <so...@apache.org>
Authored: Thu Mar 16 04:13:20 2017 +0000
Committer: Maxim Solodovnik <so...@apache.org>
Committed: Thu Mar 16 04:13:20 2017 +0000
----------------------------------------------------------------------
.../whiteboard/base/baseDrawImage.lzx | 2 +-
.../whiteboard/base/imageForDrawView.lzx | 44 ++++++++++----------
2 files changed, 23 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/5d4504e1/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawImage.lzx
----------------------------------------------------------------------
diff --git a/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawImage.lzx b/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawImage.lzx
index 24b1489..7c99312 100644
--- a/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawImage.lzx
+++ b/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDrawImage.lzx
@@ -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);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/5d4504e1/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/imageForDrawView.lzx
----------------------------------------------------------------------
diff --git a/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/imageForDrawView.lzx b/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/imageForDrawView.lzx
index 1ec65c3..f2ad01b 100644
--- a/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/imageForDrawView.lzx
+++ b/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/imageForDrawView.lzx
@@ -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>