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/05/29 10:23:35 UTC
svn commit: r1745983 - in /openmeetings/application/branches:
3.1.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
Author: solomax
Date: Sun May 29 10:23:35 2016
New Revision: 1745983
URL: http://svn.apache.org/viewvc?rev=1745983&view=rev
Log:
[OPENMEETINGS-1412] test audio/video dialog size is fixed
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx?rev=1745983&r1=1745982&r2=1745983&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx Sun May 29 10:23:35 2016
@@ -621,30 +621,29 @@
<handler name="onselect" args="item">
<![CDATA[
if (!canvas.isInterview) {
- if ($debug) Debug.write("onselect w ", item.cam_width);
- if ($debug) Debug.write("onselect h ", item.cam_height);
- parent.setAttribute("cam_default_width",item.cam_width);
- parent.setAttribute("cam_default_height",item.cam_height);
+ if ($debug) Debug.write("availibleResolutions::onselect cam [W x H] ", item.cam_width, item.cam_height);
+ parent.setAttribute("cam_default_width", item.cam_width);
+ parent.setAttribute("cam_default_height", item.cam_height);
+ var py = parent.y < 0 ? 5 : parent.y;
+ var maxWidth = Math.min(600, canvas.width - parent.x - 10)
+ , maxHeight = Math.min(500, canvas.height - py - 10)
+ , newWidth = maxWidth, newHeight = maxHeight;;
if (item.cam_width > 240) {
- var newWidth = 600 + item.cam_width - 240;
- if (newWidth+parent.x+10 > canvas.width) {
- newWidth = canvas.width - 10 - this.x;
- }
- parent.setAttribute("width",newWidth);
- } else {
- parent.setAttribute("width",600);
+ newWidth = maxWidth + item.cam_width - 240;
}
-
if (item.cam_height > 180) {
- var newHeight = 500 + item.cam_height - 180;
- if (newHeight+parent.y+10 > canvas.height) {
- newHeight = canvas.height - 10 - parent.y;
- }
- parent.setAttribute("height",newHeight);
- } else {
- parent.setAttribute("height",500);
+ newHeight = maxHeight + item.cam_height - 180;
+ }
+
+ if (newWidth + parent.x + 10 > canvas.width) {
+ newWidth = maxWidth;
+ }
+ if (newHeight + py + 10 > canvas.height) {
+ newHeight = maxHeight;
}
+ parent.setAttribute("width", newWidth);
+ parent.setAttribute("height", newHeight);
}
parent.attachCamera();
]]>
Modified: openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx?rev=1745983&r1=1745982&r2=1745983&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/video/editRecordStreamSWF10.lzx Sun May 29 10:23:35 2016
@@ -621,30 +621,29 @@
<handler name="onselect" args="item">
<![CDATA[
if (!canvas.isInterview) {
- if ($debug) Debug.write("onselect w ", item.cam_width);
- if ($debug) Debug.write("onselect h ", item.cam_height);
- parent.setAttribute("cam_default_width",item.cam_width);
- parent.setAttribute("cam_default_height",item.cam_height);
+ if ($debug) Debug.write("availibleResolutions::onselect cam [W x H] ", item.cam_width, item.cam_height);
+ parent.setAttribute("cam_default_width", item.cam_width);
+ parent.setAttribute("cam_default_height", item.cam_height);
+ var py = parent.y < 0 ? 5 : parent.y;
+ var maxWidth = Math.min(600, canvas.width - parent.x - 10)
+ , maxHeight = Math.min(500, canvas.height - py - 10)
+ , newWidth = maxWidth, newHeight = maxHeight;;
if (item.cam_width > 240) {
- var newWidth = 600 + item.cam_width - 240;
- if (newWidth+parent.x+10 > canvas.width) {
- newWidth = canvas.width - 10 - this.x;
- }
- parent.setAttribute("width",newWidth);
- } else {
- parent.setAttribute("width",600);
+ newWidth = maxWidth + item.cam_width - 240;
}
-
if (item.cam_height > 180) {
- var newHeight = 500 + item.cam_height - 180;
- if (newHeight+parent.y+10 > canvas.height) {
- newHeight = canvas.height - 10 - parent.y;
- }
- parent.setAttribute("height",newHeight);
- } else {
- parent.setAttribute("height",500);
+ newHeight = maxHeight + item.cam_height - 180;
+ }
+
+ if (newWidth + parent.x + 10 > canvas.width) {
+ newWidth = maxWidth;
+ }
+ if (newHeight + py + 10 > canvas.height) {
+ newHeight = maxHeight;
}
+ parent.setAttribute("width", newWidth);
+ parent.setAttribute("height", newHeight);
}
parent.attachCamera();
]]>