Author: solomax
Date: Fri Apr 4 00:48:36 2014
New Revision: 1584484
URL: http://svn.apache.org/r1584484
Log:
[OPENMEETINGS-966] Time zone retrieving is fixed in autoloader
Modified:
openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx
openmeetings/branches/3.0.x/WebContent/src/modules/invitation/autoloaderBarOnly.lzx
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/autoloaderBarOnly.lzx
Modified:
openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1584484&r1=1584483&r2=1584484&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx
(original)
+++
openmeetings/branches/3.0.x/WebContent/src/base/hibernate/hibRtmpConnection.lzx
Fri Apr 4 00:48:36 2014
@@ -624,7 +624,7 @@
if($debug) Debug.write("getRoomTypes");
parent.getRoomTypes.doCall();
} else {
- parent.initlanguageLoaded=true;
+ parent.initlanguageLoaded =
true;
if($debug)
Debug.write("getGeneralOptions");
parent.getGeneralOptions.doCall();
if($debug)
Debug.write("getTimeZones");
Modified:
openmeetings/branches/3.0.x/WebContent/src/modules/invitation/autoloaderBarOnly.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/invitation/autoloaderBarOnly.lzx?rev=1584484&r1=1584483&r2=1584484&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/WebContent/src/modules/invitation/autoloaderBarOnly.lzx
(original)
+++
openmeetings/branches/3.0.x/WebContent/src/modules/invitation/autoloaderBarOnly.lzx
Fri Apr 4 00:48:36 2014
@@ -68,20 +68,41 @@
} else {
parent.setProgress();
parent.getTimeZones.doCall();
+ parent.getUserSalutations.doCall();
}
]]>
</handler>
</netRemoteCallHib>
- <netRemoteCallHib name="getTimeZones" funcname="xmlcrm.getTimeZones"
- remotecontext="$once{ canvas.thishib }"
dataobject="timeZoneSet">
- <handler name="ondata" args="value">
- //The onResult-Handler will be called be the rtmpconnection
- //Debug.write("getStates: ",value);
- parent.setProgress();
- parent.getUserSalutations.doCall();
- </handler>
- </netRemoteCallHib>
+ <netRemoteCallHib name="getTimeZones" funcname="xmlcrm.getTimeZones">
+ <attribute name="start" value="0" type="number" />
+ <attribute name="step" value="100" type="number" />
+ <netparam><method name="getValue">return
parent.start;</method></netparam>
+ <netparam><method name="getValue">return
parent.step;</method></netparam>
+ <handler name="ondata" args="value">
+ <![CDATA[
+ //The onResult-Handler will be called be the
rtmpconnection
+ if ($debug) Debug.write("getTimeZones count: ",
value.length);
+ if (canvas.thishib.loaderVar != null) {
+ canvas.thishib.loaderVar.setProgress();
+ }
+ if (start == 0) {
+ canvas.timeZones = new Array();
+ }
+ for (var i = 0; i < value.length; ++i) {
+ canvas.timeZones.push(value[i]);
+ }
+ if (value.length < step) {
+ //if($debug) Debug.write("canvas.timeZones ==
", canvas.timeZones);
+ canvas.inviteMainWindow = new
lz.inviteMainWindow(canvas);
+ if($debug) Debug.write("create
invitationWindow: ",canvas.inviteMainWindow);
+ } else {
+ start += step;
+ doCall();
+ }
+ ]]>
+ </handler>
+ </netRemoteCallHib>
<netRemoteCallHib name="getUserSalutations"
funcname="userservice.getUserSalutations"
remotecontext="$once{ canvas.thishib }" >
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1584484&r1=1584483&r2=1584484&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
Fri Apr 4 00:48:36 2014
@@ -624,7 +624,7 @@
if($debug) Debug.write("getRoomTypes");
parent.getRoomTypes.doCall();
} else {
- parent.initlanguageLoaded=true;
+ parent.initlanguageLoaded =
true;
if($debug)
Debug.write("getGeneralOptions");
parent.getGeneralOptions.doCall();
if($debug)
Debug.write("getTimeZones");
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/autoloaderBarOnly.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/autoloaderBarOnly.lzx?rev=1584484&r1=1584483&r2=1584484&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/autoloaderBarOnly.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/autoloaderBarOnly.lzx
Fri Apr 4 00:48:36 2014
@@ -68,20 +68,41 @@
} else {
parent.setProgress();
parent.getTimeZones.doCall();
+ parent.getUserSalutations.doCall();
}
]]>
</handler>
</netRemoteCallHib>
- <netRemoteCallHib name="getTimeZones" funcname="xmlcrm.getTimeZones"
- remotecontext="$once{ canvas.thishib }"
dataobject="timeZoneSet">
- <handler name="ondata" args="value">
- //The onResult-Handler will be called be the rtmpconnection
- //Debug.write("getStates: ",value);
- parent.setProgress();
- parent.getUserSalutations.doCall();
- </handler>
- </netRemoteCallHib>
+ <netRemoteCallHib name="getTimeZones" funcname="xmlcrm.getTimeZones">
+ <attribute name="start" value="0" type="number" />
+ <attribute name="step" value="100" type="number" />
+ <netparam><method name="getValue">return
parent.start;</method></netparam>
+ <netparam><method name="getValue">return
parent.step;</method></netparam>
+ <handler name="ondata" args="value">
+ <![CDATA[
+ //The onResult-Handler will be called be the
rtmpconnection
+ if ($debug) Debug.write("getTimeZones count: ",
value.length);
+ if (canvas.thishib.loaderVar != null) {
+ canvas.thishib.loaderVar.setProgress();
+ }
+ if (start == 0) {
+ canvas.timeZones = new Array();
+ }
+ for (var i = 0; i < value.length; ++i) {
+ canvas.timeZones.push(value[i]);
+ }
+ if (value.length < step) {
+ //if($debug) Debug.write("canvas.timeZones ==
", canvas.timeZones);
+ canvas.inviteMainWindow = new
lz.inviteMainWindow(canvas);
+ if($debug) Debug.write("create
invitationWindow: ",canvas.inviteMainWindow);
+ } else {
+ start += step;
+ doCall();
+ }
+ ]]>
+ </handler>
+ </netRemoteCallHib>
<netRemoteCallHib name="getUserSalutations"
funcname="userservice.getUserSalutations"
remotecontext="$once{ canvas.thishib }" >
