You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by vd...@apache.org on 2013/12/18 11:11:34 UTC
svn commit: r1551899 - in /openmeetings/trunk/singlewebapp/WebContent/src:
base/mainAttributes.lzx base/mainMethods.lzx main.lzx
modules/invitation/inviteMainWindow.lzx
Author: vdegtyarev
Date: Wed Dec 18 10:11:34 2013
New Revision: 1551899
URL: http://svn.apache.org/r1551899
Log:
OPENMEETINGS-860 is fixed. Invitation window is opened without delay.
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
openmeetings/trunk/singlewebapp/WebContent/src/main.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/inviteMainWindow.lzx
Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx?rev=1551899&r1=1551898&r2=1551899&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx Wed Dec 18 10:11:34 2013
@@ -254,6 +254,9 @@ the LAST RoomClient Object that has been
<attribute name="salutationsInitValues" value="null" />
<attribute name="roomTypesInitValues" value="null" />
+<attribute name="stdTimeOffset" value="0" type="number" />
+<attribute name="inviteMainWindow" value="null" />
+
<!--- Audio-Video Quality Settings
overwritten by values from the public/config.xml
-->
Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1551899&r1=1551898&r2=1551899&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx Wed Dec 18 10:11:34 2013
@@ -487,7 +487,7 @@
if($debug) Debug.write("doActionmenu: ",stringSub);
if (canvas._conferencemenu.visibility == 'visible'){
if (stringSub == "invitation") {
- new lz.inviteMainWindow(canvas.main_content._content.inner);
+ canvas.inviteMainWindow.setAttribute('visibility', 'visible');
} else if (stringSub=='editWhiteboardDefault') {
new lz.editWhiteboardDefault(canvas.main_content._content.inner);
} else if (stringSub=='createPoll') {
@@ -637,6 +637,10 @@
//this is needed cause in the rpc-method *getCurrentModeratorList* we check if its roomtype_id == 3
//and if roomtype_id == 3 we will not show any *There is no Moderator* Warning Dialog
canvas.currentRoomObject = roomObj;
+
+ var inviteMainWindow = new lz.inviteMainWindow(canvas);
+ canvas.inviteMainWindow = inviteMainWindow;
+ if($debug) Debug.write("create invitationWindow: ",canvas.inviteMainWindow);
hib.currentroomid = roomId;
if (roomObj!=null){
Modified: openmeetings/trunk/singlewebapp/WebContent/src/main.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx?rev=1551899&r1=1551898&r2=1551899&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/main.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/main.lzx Wed Dec 18 10:11:34 2013
@@ -58,12 +58,20 @@
cmenu.hideBuiltInItems();
if($debug) Debug.write("main.lzx/oninit:",this);
canvas.lc = new LocalConnection();
+
+ getTimeZoneOffset(this);
</handler>
<handler name="onerror" args="errmsg">
canvas.remoteLogWrite("error " + errmsg);
</handler>
+<method name="callback" args="returnValue">
+ if ($debug) Debug.write("getTimeZoneOffset callback ",returnValue);
+
+ canvas.stdTimeOffset = Number(returnValue);
+</method>
+
<!-- View for Contents. All Windows will be loaded on this view. -->
<view name="main_content" y="${ canvas.naviHeightDelta }" width="${canvas.width}"
height="${ canvas.height-canvas.naviHeightDelta }"
Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/inviteMainWindow.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/inviteMainWindow.lzx?rev=1551899&r1=1551898&r2=1551899&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/inviteMainWindow.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/inviteMainWindow.lzx Wed Dec 18 10:11:34 2013
@@ -26,7 +26,7 @@
label: send invitation
-->
<class name="inviteMainWindow" extends="labelExplorerBox" labelid="214"
- docking="true" closable="true" width="464" x="200" y="100" height="465">
+ docking="true" closable="false" width="464" x="200" y="100" height="465">
<attribute name="roomType" value="conference" type="string" />
<attribute name="baseUrl" value="http://www.denic.de" type="string" />
@@ -35,29 +35,34 @@
<handler name="oninit">
<![CDATA[
- lz.ModeManager.makeModal(this);
-
- getTimeZoneOffset(this);
-
+ this.setAttribute('visibility', 'hidden');
this.baseUrl = canvas.getAppBaseUrl();
if( $debug ) Debug.write("this.baseUrl: ", this.baseUrl);
- if (!canvas.isConference){
- this.roomType = "restricted"; //FIXME
- }
]]>
</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>
+ <handler name="onvisible" args="v">
+ <![CDATA[
+ if (v) {
+ this.setOffset(canvas.stdTimeOffset);
+ this._recipient.setAttribute('text', '');
+ this._message.setAttribute('text', '');
+ this._password.setAttribute('text', '');
+ this._ispasswordProtected.setValue(false);
+ this._timeFrom.setAttribute('text', getStringTime());
+ this._timeTo.setAttribute('text', getStringTime());
+ lz.ModeManager.makeModal(this);
+ if (!canvas.isConference){
+ this.roomType = "restricted"; //FIXME
+ }
+ } else {
+ lz.ModeManager.release(this);
+ }
+ ]]>
+ </handler>
<method name="setOffset" args="std_time_offset">
<![CDATA[
- std_time_offset = Math.round(std_time_offset);
+ var std_time_offset = Math.round(std_time_offset);
var timeZoneJavaFormat = "Etc/GMT";
if (std_time_offset > 0) {
timeZoneJavaFormat += "+"+std_time_offset;
@@ -76,10 +81,6 @@
this._languages.selectItem(canvas.language_id);
]]>
</method>
-
- <handler name="onclose">
- lz.ModeManager.release(this);
- </handler>
<!-- label: recipient -->
<labelText labelid="216" y="24" width="120" />
@@ -173,7 +174,7 @@
<!-- label: cancel -->
<simpleLabelButton labelid="219" x="$once{ parent.width-130 }" width="120" y="$once{ parent.height-26 }">
<handler name="onclick">
- parent.close();
+ parent.setAttribute('visibility', 'hidden');
</handler>
</simpleLabelButton>
@@ -187,7 +188,7 @@
<handler name="ondata" args="value">
<![CDATA[
if (value != null){
- parent.close();
+ parent.setAttribute('visibility', 'hidden');
} else {
new lz.errorPopup(canvas.main_content._content.inner,{error:value});
}
@@ -229,7 +230,7 @@
parent.currentHash = value.hash;
parent._url.setAttribute('text', parent.baseUrl + "?invitationHash=" + parent.currentHash + "&language=" + parent._languages.getValue());
} else {
- parent.close();
+ parent.setAttribute('visibility', 'hidden');
}
} else {
new lz.errorPopup(canvas.main_content._content.inner,{error:value});