Revision: 3785
Author: seba.wagner
Date: Fri Jun 10 01:12:30 2011
Log: Modifications to eliminate lz.Browser, Part 1
http://code.google.com/p/openmeetings/source/detail?r=3785
Added:
/trunk/singlewebapp/WebContent/openmeetings/base/externalJavaScript.lzx
/trunk/singlewebapp/server/red5/webapps/openmeetings/openmeetings_functions.js
Modified:
/trunk/singlewebapp/WebContent/openmeetings/base/auth/registerNewUser.lzx
/trunk/singlewebapp/WebContent/openmeetings/base/library.lzx
/trunk/singlewebapp/WebContent/openmeetings/base/sipfunctions.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/popups/redirectBox.lzx
/trunk/singlewebapp/WebContent/openmeetings/plugins
/trunk/singlewebapp/WebContent/openmeetings/plugins/library.lzx
/trunk/singlewebapp/src/templates/sip_template.vm
/trunk/singlewebapp/src/templates/usual_template.vm
=======================================
--- /dev/null
+++ /trunk/singlewebapp/WebContent/openmeetings/base/externalJavaScript.lzx
Fri Jun 10 01:12:30 2011
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<library>
+
+<script>
+<![CDATA[
+
+ flash.external.ExternalInterface.addCallback("redirectToUrlCallback",
null, redirectToUrlCallback);
+ flash.external.ExternalInterface.addCallback("getTimeZoneOffsetCallback",
null, getTimeZoneOffsetCallback);
+
+ var redirectToUrlReturnObject = null;
+ var timeZoneOffsetReturnObject = null;
+
+ function redirectToUrl(url, returnObject) {
+
+ redirectToUrlReturnObject = returnObject;
+
+ flash.external.ExternalInterface.call("getAppletStatus", url);
+
+ //lz.Browser.callJS("redirectToUrl",callback,this.redirectURL);
+ }
+
+ function redirectToUrlCallback(returnValue) {
+ if ($debug) Debug.write("redirectToUrlCallback ",returnValue);
+ if (redirectToUrlReturnObject != null) {
+ redirectToUrlReturnObject.callback(returnValue);
+ }
+ }
+
+
+ function getTimeZoneOffset(returnObject) {
+
+ timeZoneOffsetReturnObject = returnObject;
+
+ flash.external.ExternalInterface.call("getTimeZoneOffset");
+
+
//lz.Browser.callJS("getTimeZoneOffset",getTimeZoneOffsetCallback);
+ }
+
+ function getTimeZoneOffsetCallback(returnValue) {
+ if ($debug) Debug.write("getTimeZoneOffsetCallback
",returnValue);
+ if (timeZoneOffsetReturnObject != null) {
+ timeZoneOffsetReturnObject.callback(returnValue);
+ }
+ }
+
+]]>
+</script>
+
+</library>
=======================================
--- /dev/null
+++
/trunk/singlewebapp/server/red5/webapps/openmeetings/openmeetings_functions.js
Fri Jun 10 01:12:30 2011
@@ -0,0 +1,31 @@
+/*
+ * Functions to be included in the HTML wrapper,
+ * see the templates dir (*.vm) for the include statements
+ *
+ */
+
+function getBrowserInfo() {
+ //alert(navigator.userAgent);
+ return navigator.userAgent;
+}
+
+function getBrowserLang() {
+ //alert(navigator.userAgent);
+ return navigator.language;
+}
+
+function redirectToUrl(url) {
+ //alert(navigator.userAgent);
+ window.location = url;
+
+ document.getElementById("lzapp").redirectToUrlCallback("ok");
+}
+
+function getTimeZoneOffset(){
+ var rightNow = new Date();
+ var jan1 = new Date(rightNow.getFullYear(), 0, 1, 0, 0, 0, 0);
+ var temp = jan1.toGMTString();
+ var jan2 = new Date(temp.substring(0,
temp.lastIndexOf(" ")-1));
+ var std_time_offset = (jan1 - jan2) / (1000 * 60 * 60);
+ return std_time_offset;
+}
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/base/auth/registerNewUser.lzx
Mon Apr 18 05:08:54 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/base/auth/registerNewUser.lzx
Fri Jun 10 01:12:30 2011
@@ -13,23 +13,19 @@
var pressEnter = new LzDelegate(this, "register");
lz.Keys.callOnKeyCombo(pressEnter, ["enter"]);
- var t = this;
-
- function getTimeZoneOffsetCallback(returnValue) {
-
- if ($debug)
Debug.write("getTimeZoneOffsetCallback ",returnValue);
-
- var std_time_offset = Number(returnValue);
-
- t.setOffset(std_time_offset);
-
- }
-
-
lz.Browser.callJS("getTimeZoneOffset",getTimeZoneOffsetCallback);
+ getTimeZoneOffset(this);
]]>
</handler>
+ <method name="callback" args="returnValue">
+ if ($debug) Debug.write("getTimeZoneOffset callback ",returnValue);
+
+ var std_time_offset = Number(returnValue);
+
+ this.setOffset(std_time_offset);
+ </method>
+
<method name="setOffset" args="std_time_offset">
<![CDATA[
std_time_offset = Math.round(std_time_offset);
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/base/library.lzx Thu Jan 21
05:26:55 2010
+++ /trunk/singlewebapp/WebContent/openmeetings/base/library.lzx Fri Jun 10
01:12:30 2011
@@ -14,7 +14,8 @@
<include href="tabbar/" />
-->
<!-- for main.lzx -->
- <include href="functions.lzx" />
+ <include href="externalJavaScript.lzx" />
+ <include href="functions.lzx" />
<include href="sipfunctions.lzx" />
<include href="mainAttributes.lzx" />
<include href="mainDatasets.lzx" />
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/base/sipfunctions.lzx Thu
Jun 9 10:58:33 2011
+++ /trunk/singlewebapp/WebContent/openmeetings/base/sipfunctions.lzx Fri
Jun 10 01:12:30 2011
@@ -76,7 +76,7 @@
if ($debug) Debug.write("initializeSIPApplet ::
flash.external.ExternalInterface (getAppletStatus) ");
- flash.external.ExternalInterface.call("getAppletStatus")
+ flash.external.ExternalInterface.call("getAppletStatus");
//lz.Browser.callJS("getAppletStatus",callbackgetAppletStatus);
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/popups/redirectBox.lzx
Thu Sep 2 10:40:07 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/popups/redirectBox.lzx
Fri Jun 10 01:12:30 2011
@@ -37,14 +37,8 @@
} else {
- function callback(returnValue) {
-
- if ($debug) Debug.write("callback ",returnValue);
-
- }
-
if ($debug) Debug.write("this.redirectURL
",this.redirectURL);
-
lz.Browser.callJS("redirectToUrl",callback,this.redirectURL);
+ redirectToUrl(this.redirectURL, null);
}
]]>
</method>
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/plugins/library.lzx Tue Apr
19 02:36:23 2011
+++ /trunk/singlewebapp/WebContent/openmeetings/plugins/library.lzx Fri Jun
10 01:12:30 2011
@@ -3,6 +3,9 @@
<!-- Add the Folder and Entry for your Plugin here -->
+ <!--
+ <include href="livewall/"/>
+ -->
<include href="fileexplorer/"/>
<include href="sponsors/"/>
<include href="conference/"/>
=======================================
--- /trunk/singlewebapp/src/templates/sip_template.vm Tue Sep 21 12:38:21
2010
+++ /trunk/singlewebapp/src/templates/sip_template.vm Fri Jun 10 01:12:30
2011
@@ -44,33 +44,8 @@
<script type="text/javascript"
src="embed-compressed.js"></script>
-<script type="text/javascript">
-
-function getBrowserInfo() {
- //alert(navigator.userAgent);
- return navigator.userAgent;
-}
-
-function getBrowserLang() {
- //alert(navigator.userAgent);
- return navigator.language;
-}
-
-function redirectToUrl(url) {
- //alert(navigator.userAgent);
- return window.location = url;
-}
-
-function getTimeZoneOffset(){
- var rightNow = new Date();
- var jan1 = new Date(rightNow.getFullYear(), 0, 1, 0, 0, 0, 0);
- var temp = jan1.toGMTString();
- var jan2 = new Date(temp.substring(0,
temp.lastIndexOf(" ")-1));
- var std_time_offset = (jan1 - jan2) / (1000 * 60 * 60);
- return std_time_offset;
-}
-
-</script>
+<script type="text/javascript"
+ src="openmeetings_functions.js"></script>
<style type="text/css">
html,body { /* http://www.quirksmode.org/css/100percheight.html */
=======================================
--- /trunk/singlewebapp/src/templates/usual_template.vm Tue Sep 21 12:38:21
2010
+++ /trunk/singlewebapp/src/templates/usual_template.vm Fri Jun 10 01:12:30
2011
@@ -39,38 +39,10 @@
<script type="text/javascript"
src="embed-compressed.js"></script>
+<script type="text/javascript"
+ src="openmeetings_functions.js"></script>
<script type="text/javascript">
-function getBrowserInfo() {
- //alert(navigator.userAgent);
- return navigator.userAgent;
-}
-
-function getBrowserLang() {
- //alert(navigator.userAgent);
- return navigator.language;
-}
-
-function getBrowserInfo() {
- //alert(navigator.userAgent);
- return navigator.userAgent;
-}
-
-function redirectToUrl(url) {
- //alert(navigator.userAgent);
- return window.location = url;
-}
-
-function getTimeZoneOffset(){
- var rightNow = new Date();
- var jan1 = new Date(rightNow.getFullYear(), 0, 1, 0, 0, 0, 0);
- var temp = jan1.toGMTString();
- var jan2 = new Date(temp.substring(0,
temp.lastIndexOf(" ")-1));
- var std_time_offset = (jan1 - jan2) / (1000 * 60 * 60);
- return std_time_offset;
-}
-
-
function getAppletStatus(){
return false;
}
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
