svn commit: r1771867 - in /openmeetings/application/branches: 3.1.x/openmeetings-flash/src/main/swf/ 3.1.x/openmeetings-flash/src/main/swf/video/ 3.2.x/openmeetings-flash/src/main/swf/ 3.2.x/openmeeti
Author: solomax
Date: Tue Nov 29 09:29:28 2016
New Revision: 1771867
URL: http://svn.apache.org/viewvc?rev=1771867=rev
Log:
no jira: code clean-up
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
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/commonVideoViewContentSWF10.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/commonVideoViewContentSWF10.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx?rev=1771867=1771866=1771867=diff
==
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/commonVideoViewContentSWF10.lzx
Tue Nov 29 09:29:28 2016
@@ -8,8 +8,8 @@
"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
-
+ 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
@@ -99,6 +99,14 @@
return vidContainer;
+
+ if (!obj) {
+ return;
+ }
+ var dispName = !last ? first : first + ' ' + last;
+ obj.setAttribute('chatpartnername', dispName);
+
+
-
+
@@ -635,7 +623,7 @@
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;;
+ , newWidth = maxWidth, newHeight =
maxHeight;
if (item.cam_width > 240) {
newWidth = maxWidth + item.cam_width -
240;
}
@@ -672,7 +660,7 @@
this.cam_width =
Number(this.datapath.xpathQuery('@width'));
this.cam_height =
Number(this.datapath.xpathQuery('@height'));
this.setAttribute("text",""+this.cam_width+"x"+this.cam_height+" ["+type+"]");
- var isDefault =
this.datapath.xpathQuery('@isDefault');
+ var isDefault =
this.datapath.xpathQuery('@isDefault') == "true";
var t:SharedObject =
SharedObject.getLocal('userdata');
var g = t.data;
@@ -684,30 +672,28 @@
parent.onselect.sendEvent(this);
}
} else {
- if (isDefault == "true") {
+ if (isDefault) {
if ($debug)
Debug.write("Found default one ",type);
parent.selectItemAt(parent.counter);
parent.onselect.sendEvent(this);
}
}
- parent.counter+=1;
+ parent.counter += 1;
]]>
-
+
-
+
parent._level_meter.startLevel();
parent.doStartRecording();
-
+
-
@@ -727,37 +713,32 @@
+ width="${
parent.parent.parent.cam_default_width }"
+ height="${
parent.parent.parent.cam_default_height }" />
svn commit: r1771998 - in /openmeetings/application/branches/3.1.x/openmeetings-web/src/main: java/org/apache/openmeetings/web/pages/install/ webapp/css/
Author: vdegtyarev Date: Wed Nov 30 07:19:41 2016 New Revision: 1771998 URL: http://svn.apache.org/viewvc?rev=1771998=rev Log: Merged revision(s) 1771997 from openmeetings/application/branches/3.2.x: OPENMEETINGS-1513 is fixed. Installer Converters page is improved to check that installed converter tools or not. Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard%24ParamsStep3.html?rev=1771998=1771997=1771998=diff == --- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html (original) +++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html Wed Nov 30 07:19:41 2016 @@ -23,66 +23,45 @@ - + + + - - - -http://openmeetings.apache.org/installation.html; - target="_blank"> - - - + + + - - - -http://openmeetings.apache.org/installation.html; - target="_blank"> - - - + + + + - - - -http://openmeetings.apache.org/installation.html; - target="_blank"> - - + + -http://openmeetings.apache.org/installation.html; - target="_blank"> + -http://openmeetings.apache.org/installation.html; - target="_blank"> @@ -90,22 +69,24 @@ + -http://openmeetings.apache.org/installation.html; - target="_blank"> - + + + + + + -
svn commit: r1771997 - in /openmeetings/application/branches/3.2.x/openmeetings-web/src/main: java/org/apache/openmeetings/web/pages/install/ webapp/css/
Author: vdegtyarev Date: Wed Nov 30 07:17:10 2016 New Revision: 1771997 URL: http://svn.apache.org/viewvc?rev=1771997=rev Log: OPENMEETINGS-1513 is fixed. Installer Converters page is improved to check that installed converter tools or not. Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/theme.css Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard%24ParamsStep3.html?rev=1771997=1771996=1771997=diff == --- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html (original) +++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html Wed Nov 30 07:17:10 2016 @@ -23,66 +23,45 @@ - + + + - - - -http://openmeetings.apache.org/installation.html; - target="_blank"> - - - + + + - - - -http://openmeetings.apache.org/installation.html; - target="_blank"> - - - + + + + - - - -http://openmeetings.apache.org/installation.html; - target="_blank"> - - + + -http://openmeetings.apache.org/installation.html; - target="_blank"> + -http://openmeetings.apache.org/installation.html; - target="_blank"> @@ -90,22 +69,24 @@ + -http://openmeetings.apache.org/installation.html; - target="_blank"> - + + + + + + -
[jira] [Commented] (OPENMEETINGS-1513) The Installer Converters page should be improved
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1513?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15707819#comment-15707819 ] ASF subversion and git services commented on OPENMEETINGS-1513: --- Commit 1771997 from [~vdegtyarev] in branch 'application/branches/3.2.x' [ https://svn.apache.org/r1771997 ] OPENMEETINGS-1513 is fixed. Installer Converters page is improved to check that installed converter tools or not. > The Installer Converters page should be improved > > > Key: OPENMEETINGS-1513 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1513 > Project: Openmeetings > Issue Type: Bug > Components: HTML5/Installer >Affects Versions: 3.2.0 >Reporter: Vasiliy Degtyarev >Assignee: Vasiliy Degtyarev > Fix For: 3.1.4, 3.2.0, 4.0.0 > > > To improve the installer you need to add a check that install the required > tool on the server or not. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Created] (OPENMEETINGS-1513) The Installer Converters page should be improved
Vasiliy Degtyarev created OPENMEETINGS-1513: --- Summary: The Installer Converters page should be improved Key: OPENMEETINGS-1513 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1513 Project: Openmeetings Issue Type: Bug Components: HTML5/Installer Affects Versions: 3.2.0 Reporter: Vasiliy Degtyarev Assignee: Vasiliy Degtyarev Fix For: 3.1.4, 3.2.0, 4.0.0 To improve the installer you need to add a check that install the required tool on the server or not. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (OPENMEETINGS-1513) The Installer Converters page should be improved
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1513?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=15707823#comment-15707823 ] ASF subversion and git services commented on OPENMEETINGS-1513: --- Commit 1771998 from [~vdegtyarev] in branch 'application/branches/3.1.x' [ https://svn.apache.org/r1771998 ] Merged revision(s) 1771997 from openmeetings/application/branches/3.2.x: OPENMEETINGS-1513 is fixed. Installer Converters page is improved to check that installed converter tools or not. > The Installer Converters page should be improved > > > Key: OPENMEETINGS-1513 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1513 > Project: Openmeetings > Issue Type: Bug > Components: HTML5/Installer >Affects Versions: 3.2.0 >Reporter: Vasiliy Degtyarev >Assignee: Vasiliy Degtyarev > Fix For: 3.1.4, 3.2.0, 4.0.0 > > > To improve the installer you need to add a check that install the required > tool on the server or not. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
