Author: solomax
Date: Fri Jul 22 18:25:34 2016
New Revision: 1753827
URL: http://svn.apache.org/viewvc?rev=1753827&view=rev
Log:
no jira: drop/remove video to/from WB is fixed
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx?rev=1753827&r1=1753826&r2=1753827&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
Fri Jul 22 18:25:34 2016
@@ -443,8 +443,10 @@
<method name="deleteItemByNameSync" args="objName">
<![CDATA[
if ($debug) Debug.write("deleteItemByNameSync :: ", objName);
- this[objName].prepareForDelete.sendEvent();
- this[objName].destroy();
+ if (this[objName]) {
+ this[objName].prepareForDelete.sendEvent();
+ this[objName].destroy();
+ }
if (this.boundingref!=null) this.boundingref.removeIt();
var pos = -1;
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx?rev=1753827&r1=1753826&r2=1753827&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
Fri Jul 22 18:25:34 2016
@@ -136,7 +136,7 @@
var ratio = this.flv_width / this.flv_height;
var t = {};
- var area = {height: this.height - 62, width: parent.width - 1}
+ var area = {height: parent.height - 62, width: parent.width - 1}
//max height of container is new height of video;
//calc new width and x-position of video
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx?rev=1753827&r1=1753826&r2=1753827&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/baseDraw.lzx
Fri Jul 22 18:25:34 2016
@@ -443,8 +443,10 @@
<method name="deleteItemByNameSync" args="objName">
<![CDATA[
if ($debug) Debug.write("deleteItemByNameSync :: ", objName);
- this[objName].prepareForDelete.sendEvent();
- this[objName].destroy();
+ if (this[objName]) {
+ this[objName].prepareForDelete.sendEvent();
+ this[objName].destroy();
+ }
if (this.boundingref!=null) this.boundingref.removeIt();
var pos = -1;
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx?rev=1753827&r1=1753826&r2=1753827&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/whiteboardVideoPlayer.lzx
Fri Jul 22 18:25:34 2016
@@ -136,7 +136,7 @@
var ratio = this.flv_width / this.flv_height;
var t = {};
- var area = {height: this.height - 62, width: parent.width - 1}
+ var area = {height: parent.height - 62, width: parent.width - 1}
//max height of container is new height of video;
//calc new width and x-position of video
