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 2015/11/08 18:58:01 UTC
svn commit: r1713276 [2/2] - in /openmeetings/branches/3.1.x:
openmeetings-flash/ openmeetings-flash/src/main/swf/
openmeetings-flash/src/main/swf/base/
openmeetings-flash/src/main/swf/base/components/
openmeetings-flash/src/main/swf/base/components/ex...
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/test/test-regExp.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/test/test-regExp.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/test/test-regExp.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf/test/test-regExp.lzx Sun Nov 8 17:58:00 2015
@@ -18,7 +18,13 @@
-->
<canvas debug="true" >
-
+ <switch>
+ <when property="$as3">
+ <passthrough>
+ import flash.external.ExternalInterface;
+ </passthrough>
+ </when>
+ </switch>
<script when="immediate" >
class LzRegExp extends Instance{
@@ -49,7 +55,7 @@
function test( s ){
if( this.__isready ){
- return flash.external.ExternalInterface.call.apply( flash.external.ExternalInterface, ["window.__testRegExp", this.regexp_id, s] );
+ return ExternalInterface.call.apply(ExternalInterface, ["window.__testRegExp", this.regexp_id, s] );
} else {
Debug.format( "called %w too early", arguments.callee.name );
}
@@ -57,7 +63,7 @@
function exec( s ){
if( this.__isready ){
- return flash.external.ExternalInterface.call.apply( flash.external.ExternalInterface, ["window.__execRegExp", this.regexp_id, s] );
+ return ExternalInterface.call.apply(ExternalInterface, ["window.__execRegExp", this.regexp_id, s] );
} else {
Debug.format( "called %w too early", arguments.callee.name );
}
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/base/components/explorer/explorerBox.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/base/components/explorer/explorerBox.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/base/components/explorer/explorerBox.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/base/components/explorer/explorerBox.lzx Sun Nov 8 17:58:00 2015
@@ -27,7 +27,7 @@
<switch>
<when property="$as3">
<passthrough>
- import flash.filters.DropShadowFilter;
+ import flash.filters.DropShadowFilter;
</passthrough>
</when>
</switch>
@@ -345,38 +345,6 @@
this.parent.parent.close();
</handler>
</view>
- <!--
- <view visible="${ !this.parent.parent.isopen }" x="2" y="3" resource="explorer_button_min_rsc">
- <handler name="onmouseover">
- this.setAttribute('frame',2);
- </handler>
- <handler name="onmouseout">
- this.setAttribute('frame',1);
- </handler>
- <handler name="onmousedown">
- this.setAttribute('frame',3);
- </handler>
- <handler name="onmouseup">
- this.setAttribute('frame',1);
- this.parent.parent.toggleopen();
- </handler>
- </view>
- <view visible="${ this.parent.parent.isopen }" x="2" y="3" resource="explorer_button_max_rsc">
- <handler name="onmouseover">
- this.setAttribute('frame',2);
- </handler>
- <handler name="onmouseout">
- this.setAttribute('frame',1);
- </handler>
- <handler name="onmousedown">
- this.setAttribute('frame',3);
- </handler>
- <handler name="onmouseup">
- this.setAttribute('frame',1);
- this.parent.parent.toggleopen();
- </handler>
- </view>
- -->
</view>
<handler name="onaddsubview" args="v">
////Debug.write("onaddsubview",v);
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/base/remote/rtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/base/remote/rtmpConnection.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/base/remote/rtmpConnection.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/base/remote/rtmpConnection.lzx Sun Nov 8 17:58:00 2015
@@ -189,10 +189,6 @@
<method name="callRPC" args="func, obj, params">
//if ($debug) Debug.write("*** call: func, obj, params",func,obj, typeof (params) ,params.length);
if (params.length != 0){
- //does this really work?
- //ASSetPropFlags(_global, null, 8, 1);
- //setPropertyIsEnumerable(8, 1);
- //Debug.write("does it work?",arguments);
<!--
this._nc.call.apply(this._nc,arguments);
-->
@@ -340,15 +336,14 @@
if (this.dataobject!=null) {
if ( this.dataobject instanceof LzDataset ) {
- //Debug.write("onResult: ",this,value,dataobject);
+ //if ($debug) Debug.write("onResult: ",this,value,dataobject);
var element = LzDataElement.valueToElement(value);
this.dataobject.setData(element.childNodes);
} else if ( this.dataobject instanceof LzDataElement ) {
var element = LzDataElement.valueToElement(value);
this.dataobject.appendChild( element );
} else {
- //TODO:fixme
- //Debug.warn("dataobject is not LzDataset or LzDataElement: ",this,this.dataobject,delegate);
+ //if ($debug) Debug.warn("dataobject is not LzDataset or LzDataElement: ",this,this.dataobject,delegate);
}
}
this.ondata.sendEvent(value);
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/commonVideoViewContentSWF10.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/commonVideoViewContentSWF10.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/commonVideoViewContentSWF10.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/commonVideoViewContentSWF10.lzx Sun Nov 8 17:58:00 2015
@@ -23,14 +23,14 @@
<class name="commonVideoViewContentSWF10" extends="view">
- <switch>
- <when property="$as3">
- <passthrough>
- import flash.net.LocalConnection;
- import flash.external.ExternalInterface;
- </passthrough>
- </when>
- </switch>
+ <switch>
+ <when property="$as3">
+ <passthrough>
+ import flash.net.LocalConnection;
+ import flash.external.ExternalInterface;
+ </passthrough>
+ </when>
+ </switch>
<attribute name="offsetLength" type="number" value="40"/>
<attribute name="videoWidth" type="number" value="132"/>
Modified: openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/main.as3.lzx
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/main.as3.lzx?rev=1713276&r1=1713275&r2=1713276&view=diff
==============================================================================
--- openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/main.as3.lzx (original)
+++ openmeetings/branches/3.1.x/openmeetings-flash/src/main/swf10/main.as3.lzx Sun Nov 8 17:58:00 2015
@@ -122,7 +122,7 @@
}
}
- var tSWFURL = canvas.getLocalBaseUrl() + "main" + ($debug ? "debug" : "") + ".swf8.swf?lzproxied=solo&lc_SID="+lc_SID+tqueryString;
+ var tSWFURL = canvas.getLocalBaseUrl() + "main" + ($debug ? "debug" : "") + ".swf11.swf?lzproxied=solo&lc_SID="+lc_SID+tqueryString;
if ($debug) Debug.write("tSWFURL :: ",tSWFURL);
Propchange: openmeetings/branches/3.1.x/openmeetings-server/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Nov 8 17:58:00 2015
@@ -1,4 +1,5 @@
target
+red5-server
.project
.classpath
.settings