Revision: 3791
Author: seba.wagner
Date: Fri Jun 10 02:36:51 2011
Log: Fixing: lz.Browser.callJS references
http://code.google.com/p/openmeetings/source/detail?r=3791
Modified:
/trunk/singlewebapp/WebContent/openmeetings/base/externalJavaScript.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/admin/useradmin/userAdminValueForm.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/browser/conferenceBrowser.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/invitation/inviteMainWindow.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/screenSharer2/screenSharingDialog.lzx
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/base/externalJavaScript.lzx
Fri Jun 10 01:59:44 2011
+++ /trunk/singlewebapp/WebContent/openmeetings/base/externalJavaScript.lzx
Fri Jun 10 02:36:51 2011
@@ -4,11 +4,18 @@
<script>
<![CDATA[
+
flash.external.ExternalInterface.addCallback("redirectToUrlCallback",
null, redirectToUrlCallback);
flash.external.ExternalInterface.addCallback("getTimeZoneOffsetCallback",
null, getTimeZoneOffsetCallback);
-
+ flash.external.ExternalInterface.addCallback("getBrowserInfoCallback",
null, getBrowserInfoCallback);
+ flash.external.ExternalInterface.addCallback("getBrowserLangCallback",
null, getBrowserLangCallback);
+
+
var redirectToUrlReturnObject = null;
var timeZoneOffsetReturnObject = null;
+ var browserInfoReturnObject = null;
+ var browserLangReturnObject = null;
+
function redirectToUrl(url, returnObject) {
@@ -42,6 +49,41 @@
timeZoneOffsetReturnObject.callback(returnValue);
}
}
+
+
+ function getBrowserInfo(returnObject) {
+
+ browserInfoReturnObject = returnObject;
+
+ flash.external.ExternalInterface.call("getBrowserInfo");
+
+ //lz.Browser.callJS("getBrowserInfo",callback);
+ }
+
+ function getBrowserInfoCallback(returnValue) {
+ if ($debug) Debug.write("getBrowserInfoCallback ",returnValue);
+ if (browserInfoReturnObject != null) {
+ browserInfoReturnObject.callback(returnValue);
+ }
+ }
+
+
+ function getBrowserLang(returnObject) {
+
+ browserLangReturnObject = returnObject;
+
+ flash.external.ExternalInterface.call("getBrowserLang");
+
+ //lz.Browser.callJS("getBrowserLang",callback);
+ }
+
+ function getBrowserLangCallback(returnValue) {
+ if ($debug) Debug.write("getBrowserLangCallback ",returnValue);
+ if (browserLangReturnObject != null) {
+ browserLangReturnObject.callback(returnValue);
+ }
+ }
+
]]>
</script>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/admin/useradmin/userAdminValueForm.lzx
Mon Apr 18 05:23:52 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/admin/useradmin/userAdminValueForm.lzx
Fri Jun 10 02:36:51 2011
@@ -50,7 +50,7 @@
}
-
lz.Browser.callJS("getTimeZoneOffset",getTimeZoneOffsetCallback);
+ getTimeZoneOffset(this);
this._organisationslist.clearList();
this.generateSipUserData.setValue(false);
@@ -65,6 +65,14 @@
]]>
</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[
var timeZoneJavaFormat = "Etc/GMT";
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/browser/conferenceBrowser.lzx
Wed Aug 11 14:49:22 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/browser/conferenceBrowser.lzx
Fri Jun 10 02:36:51 2011
@@ -64,22 +64,8 @@
if (false && os.indexOf("Win") >= 0) {
if ($debug) Debug.write("os :: version isWindows check
for Firefox Bug ",os,version);
- var t = this;
-
- function callback(returnValue) {
-
- if ($debug) Debug.write("callback ",returnValue);
-
- if (returnValue.indexOf("Firefox") >= 0) {
- //We have to use parent in this context because
it is called as
- //callback Object
- t.setAttribute("y",160);
-
- new
lz.labelerrorPopup(canvas,{y:0,errorlabelid:750});
- }
- }
-
- lz.Browser.callJS("getBrowserInfo",callback);
+
+ getBrowserLang(this);
}
@@ -108,6 +94,21 @@
]]>
</handler>
+ <method name="callback" args="returnValue">
+ <![CDATA[
+
+ if ($debug) Debug.write("getBrowserInfo
callback ",returnValue);
+
+ if (returnValue.indexOf("Firefox") >= 0) {
+
+ this.setAttribute("y",160);
+
+ new lz.labelerrorPopup(canvas,{y:0,errorlabelid:750});
+ }
+
+ ]]>
+ </method>
+
<method name="newBrowserURL" args="newURL">
this._navigation._inner.browser.navigation.url.setAttribute("text",newURL);
this._navigation._inner.browser.navigation.readStart.setURL();
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/invitation/inviteMainWindow.lzx
Sun Apr 3 07:09:17 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/invitation/inviteMainWindow.lzx
Fri Jun 10 02:36:51 2011
@@ -19,23 +19,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/modules/screenSharer2/screenSharingDialog.lzx
Fri Aug 27 05:53:15 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/screenSharer2/screenSharingDialog.lzx
Fri Jun 10 02:36:51 2011
@@ -1037,7 +1037,7 @@
}
- lz.Browser.callJS("getBrowserLang",callback);
+ lz.Browser. callJS("getBrowserLang",callback);
//var t = lz.Browser;
--
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.
