Author: solomax
Date: Sun Dec 14 07:25:30 2014
New Revision: 1645426
URL: http://svn.apache.org/r1645426
Log:
[OPENMEETINGS-1137] same language is not loaded 2nd time
Modified:
openmeetings/branches/3.0.x/WebContent/src/modules/invitation/invitationQuickLoader.lzx
Modified:
openmeetings/branches/3.0.x/WebContent/src/modules/invitation/invitationQuickLoader.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/invitation/invitationQuickLoader.lzx?rev=1645426&r1=1645425&r2=1645426&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/WebContent/src/modules/invitation/invitationQuickLoader.lzx
(original)
+++
openmeetings/branches/3.0.x/WebContent/src/modules/invitation/invitationQuickLoader.lzx
Sun Dec 14 07:25:30 2014
@@ -107,6 +107,7 @@
</method>
<method name="login">
+ <![CDATA[
this.userlang = Number(this.languages.getValue());
this.labellanguages.setAttribute('visibility','hidden');
this.languages.setAttribute('visibility','hidden');
@@ -139,7 +140,16 @@
canvas.thishib.loaderVar = new
lz.autoloaderBarOnly(canvas);
canvas.thishib.loaderVar.setProgress();
this.close();
-
canvas.thishib.loaderVar.getLanguageByIdAndMax.doCall();
+ //if (canvas.language == canvas.thishib.userlang &&
canvas.thishib.initlanguageLoaded) { TODO canvas.language seems to be dropped
+ if (canvas.language_id == canvas.thishib.userlang &&
canvas.thishib.initlanguageLoaded) {
+ if (!canvas.timeZonesLoaded) {
+
canvas.thishib.loaderVar.getTimeZones.doCall();
+ }
+
canvas.thishib.loaderVar.getUserSalutations.doCall();
+ } else {
+
canvas.thishib.loaderVar.getLanguageByIdAndMax.doCall();
+ }
+ ]]>
</method>
<!-- label: password -->
