Author: solomax
Date: Wed Jan 20 07:13:06 2016
New Revision: 1725676
URL: http://svn.apache.org/viewvc?rev=1725676&view=rev
Log:
[OPENMEETINGS-1310] wmmode is changed so permissions should be displayable
Removed:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/permissionChecker/
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/openlaszlo.xml
openmeetings/application/branches/3.1.x/openmeetings-flash/pom.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/openlaszlo.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/openlaszlo.xml?rev=1725676&r1=1725675&r2=1725676&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/openlaszlo.xml
(original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/openlaszlo.xml
Wed Jan 20 07:13:06 2016
@@ -32,7 +32,7 @@
<fileset dir="${laszlo46.home}/WEB-INF/lib" includes="*.jar" />
</path>
- <target name="client.only"
depends="compile.laszlo.main,compile.laszlo.networktesting,compile.permission"
unless="client-already-built">
+ <target name="client.only"
depends="compile.laszlo.main,compile.laszlo.networktesting"
unless="client-already-built">
<property name="client-already-built" value="true"/>
</target>
@@ -98,18 +98,6 @@
<param name="flash.debug" value="--debug" />
</antcall>
</target>
-
- <target name="compile.permission" depends="-retrieve-openlaszlo46">
- <antcall target="-compile.flash" inheritAll="true"
inheritRefs="true">
- <param name="flash.classpath.ref" value="laszlo46.lib"
/>
- <param name="flash.src.dir"
value="${src.dir}/permissionChecker" />
- <param name="flash.lps.home" value="${laszlo46.home}" />
- <param name="flash.runtime" value="swf11" />
- <param name="flash.main.file" value="checker.lzx" />
- <param name="flash.out.file"
value="permissionChecker.swf11.swf" />
- <param name="flash.debug" value="--debug" />
- </antcall>
- </target>
<target name="-availability-check" description="Check which libraries
need to be retrieved">
<available file="${laszlo46.home}/WEB-INF/lib" type="dir"
property="laszlo46.installed" />
Modified: openmeetings/application/branches/3.1.x/openmeetings-flash/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/pom.xml?rev=1725676&r1=1725675&r2=1725676&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-flash/pom.xml
(original)
+++ openmeetings/application/branches/3.1.x/openmeetings-flash/pom.xml Wed Jan
20 07:13:06 2016
@@ -70,18 +70,6 @@
<ant.target>compile.laszlo.main.debug</ant.target>
</properties>
</profile>
- <profile>
- <id>checker-only-target</id>
- <activation>
- <property>
- <name>checker-only</name>
- <value>true</value>
- </property>
- </activation>
- <properties>
- <ant.target>compile.permission</ant.target>
- </properties>
- </profile>
</profiles>
<build>
<!-- sourceDirectory>src/main/flex</sourceDirectory-->
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js?rev=1725676&r1=1725675&r2=1725676&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
Wed Jan 20 07:13:06 2016
@@ -31,7 +31,7 @@ function initSwf(swfurl) {
$('div[id="contents"], div[id="contents"] > div').css('height', '100%');
var embed = $('<embed>').attr('quality', 'high').attr('bgcolor',
options.bgcolor)
.attr('src', "public/" + options.url)
- .attr('wmode', 'opaque').attr('allowfullscreen', true)
+ .attr('wmode', 'direct').attr('allowfullscreen', true)
.attr('width', options.width).attr('height', options.height)
.attr('id', 'lzapp').attr('name', 'lzapp')
.attr('flashvars', escape($.param(general)))
@@ -40,7 +40,6 @@ function initSwf(swfurl) {
.attr('pluginspage',
'http://www.macromedia.com/go/getflashplayer');
$('#swfloading').after($('<div
id="lzappContainer">').append(embed)).width('1px').height('1px');
}
-
function roomExit() {
$('#header, #topControls, #chatPanel').show();
$('div[id="contents"], div[id="contents"] > div').css('height', 'auto');
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js?rev=1725676&r1=1725675&r2=1725676&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/swf-functions.js
Wed Jan 20 07:13:06 2016
@@ -31,7 +31,7 @@ function initSwf(swfurl) {
$('div[id="contents"], div[id="contents"] > div').css('height', '100%');
var embed = $('<embed>').attr('quality', 'high').attr('bgcolor',
options.bgcolor)
.attr('src', "public/" + options.url)
- .attr('wmode', 'opaque').attr('allowfullscreen', true)
+ .attr('wmode', 'direct').attr('allowfullscreen', true)
.attr('width', options.width).attr('height', options.height)
.attr('id', 'lzapp').attr('name', 'lzapp')
.attr('flashvars', escape($.param(general)))
