Author: sebawagner
Date: Fri Feb 3 13:59:23 2012
New Revision: 1240173
URL: http://svn.apache.org/viewvc?rev=1240173&view=rev
Log:
OPENMEETINGS-40 Merge Audio/Video components to trunk Fix some NullPointer and
labels loading to SWF10
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/explorer/resources/close_dn.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/explorer/resources/close_mo.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/explorer/resources/close_up.png
(with props)
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/functions.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/explorer/resources/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/text/labelText.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/mainMethods.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/hibAdapter.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/functions.lzx
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/explorer/resources/close_dn.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/explorer/resources/close_dn.png?rev=1240173&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/explorer/resources/close_dn.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/explorer/resources/close_mo.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/explorer/resources/close_mo.png?rev=1240173&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/explorer/resources/close_mo.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/explorer/resources/close_up.png
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/explorer/resources/close_up.png?rev=1240173&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/explorer/resources/close_up.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/explorer/resources/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/explorer/resources/library.lzx?rev=1240173&r1=1240172&r2=1240173&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/explorer/resources/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/explorer/resources/library.lzx
Fri Feb 3 13:59:23 2012
@@ -27,6 +27,12 @@
<resource name="explorer_resize_rsc" src="resizer.swf" />
+<resource name="btn_presenter_close">
+ <frame src="close_up.png" />
+ <frame src="close_mo.png" />
+ <frame src="close_dn.png" />
+</resource>
+
<resource name="explorer_resizemouse_rsc" src="resizemouse.png" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/text/labelText.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/text/labelText.lzx?rev=1240173&r1=1240172&r2=1240173&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/text/labelText.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/components/text/labelText.lzx
Fri Feb 3 13:59:23 2012
@@ -6,9 +6,6 @@
<attribute name="labelid" type="number" setter="setLabelId(labelid)" />
<method name="setLabelId" args="_labelid" >
this.labelid = _labelid;
- if ($debug) Debug.write("setLabelId -1-",canvas);
- if ($debug) Debug.write("setLabelId -2- ",this.labelid);
- if ($debug) Debug.write("setLabelId -3-
",canvas.getLabelName(this.labelid));
this.setAttribute('text',canvas.getLabelName(this.labelid));
</method>
Added:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/functions.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/functions.lzx?rev=1240173&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/functions.lzx
(added)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/functions.lzx
Fri Feb 3 13:59:23 2012
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "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
+
+ 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
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<library>
+
+
+<!--
+
+NOTICE:
+All contents regarding "chat" are moved to /modules/chat/globalMethods.lzx
+Issue353. 2008.3.28 H.kuze(minamotonoason)
+
+-->
+
+
+<script>
+<![CDATA[
+
+// Load Labels from List
+var labels = new Array();
+
+String.prototype.startsWith = function(prefix) {
+ return (this.indexOf(prefix) === 0);
+};
+
+function setLabelObjectByHundred(no,obj){
+ // if($debug) Debug.write("FUNC/setLabelObjectByHundred");
+ if(no!=0) no = Math.floor(no/100);
+ //Debug.write("SetLabelObject: ",no,obj);
+ labels[no] = obj;
+}
+
+function getLabelTag(labelid){
+ //if($debug) Debug.write("FUNC/getLabelTag",labelid);
+ var no = Math.floor(labelid/100);
+ return getLabelTagByNo(no,labelid);
+}
+
+function getLabelTagByNo(no,labelid){
+ var labeltag = "";
+ var l = labels[no]
+ //if ($debug) Debug.write("Search label tag in: ",labelid,labels[no]);
+ for (var eg=0;eg<=l.length;eg++){
+ if (l[eg].id==labelid){
+ // if($debug)
Debug.write("FUNC/getLabelTagByNo",no,labelid,l[eg].value);
+ if($debug) {
+ return l[eg].value+" ["+labelid+"]";
+ } else {
+ return l[eg].value;
+ }
+ }
+ }
+ return "Error Missing ["+labelid+"]";
+}
+
+]]>
+</script>
+
+</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/library.lzx?rev=1240173&r1=1240172&r2=1240173&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/library.lzx
Fri Feb 3 13:59:23 2012
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8" ?>
<library>
+ <include href="functions.lzx" />
+ <include href="mainAttributes.lzx" />
+ <include href="mainDatasets.lzx" />
+ <include href="mainMethods.lzx" />
+
<include href="remote/" />
<include href="components/" />
<include href="hibernate/" />
-
- <include href="mainAttributes.lzx" />
- <include href="mainDatasets.lzx" />
- <include href="mainMethods.lzx" />
</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/mainMethods.lzx?rev=1240173&r1=1240172&r2=1240173&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/mainMethods.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/base/mainMethods.lzx
Fri Feb 3 13:59:23 2012
@@ -34,9 +34,9 @@
</method>
<method name="getLabelName" args="id">
- return "label "+id;
+ // return "label "+id;
//if($debug) Debug.write("main.lzx/getLabelName()",id);
- // return getLabelTag(id);
+ return getLabelTag(id);
</method>
</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/hibAdapter.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/hibAdapter.lzx?rev=1240173&r1=1240172&r2=1240173&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/hibAdapter.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/swf10/hibAdapter.lzx
Fri Feb 3 13:59:23 2012
@@ -25,8 +25,8 @@
]]></handler>
<method name="hibAdapter_setLabelObjectByHundred" args="start,value">
- if($debug)
Debug.write("hibAdapter_setLabelObjectByHundred",start,value);
- // setLabelObjectByHundred(start,value);
+ // if($debug)
Debug.write("hibAdapter_setLabelObjectByHundred",start,value);
+ setLabelObjectByHundred(start,value);
</method>
<method name="setRoomValues" args="roomtypes_id,rooms_id,value">
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/functions.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/functions.lzx?rev=1240173&r1=1240172&r2=1240173&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/functions.lzx
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/functions.lzx
Fri Feb 3 13:59:23 2012
@@ -90,6 +90,7 @@ function disableCurrentMouseWheelObject(
}
function setLabelObjectByHundred(no,obj){
+ canvas.lc.send(canvas.rtmp_lc_name, "hibAdapter_setLabelObjectByHundred",
no, obj);
// if($debug) Debug.write("FUNC/setLabelObjectByHundred");
if(no!=0) no = Math.floor(no/100);
//Debug.write("SetLabelObject: ",no,obj);
