Author: solomax
Date: Mon Jul 16 03:57:31 2012
New Revision: 1361901
URL: http://svn.apache.org/viewvc?rev=1361901&view=rev
Log:
OPENMEETINGS-350 hot key is changed to be F8
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
incubator/openmeetings/trunk/singlewebapp/docs/HotKeys.html
incubator/openmeetings/trunk/singlewebapp/xdocs/HotKeys.xml
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx?rev=1361901&r1=1361900&r2=1361901&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
Mon Jul 16 03:57:31 2012
@@ -445,9 +445,8 @@ and some more references to temp-objects
<attribute name="currentBaseConferenceRoom" value="null" />
-<attribute name="CTRL_KEY" value="17"/> <!-- Ctrl -->
<attribute name="GIVE_EXCLUSIVE_AUDIO_KEY" value="123"/> <!-- F12 -->
-<attribute name="ARRANGE_WINDOWS_KEY" value="70"/> <!-- F -->
+<attribute name="ARRANGE_WINDOWS_KEY" value="119"/> <!-- F8 -->
<!--
Indicates if the Red5 SIP Integration is enabled or not and
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx?rev=1361901&r1=1361900&r2=1361901&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
Mon Jul 16 03:57:31 2012
@@ -162,17 +162,11 @@
if ($debug) Debug.write("ringring - ringring - ringring");
</method>
- <attribute name="ctrlPressed" type="boolean" value="false" />
<handler name="onkeydown" reference="lz.Keys" args="keyCode">
<![CDATA[
if ($debug) Debug.write("onkeydown:: keyCode = ", keyCode);
- if (canvas.CTRL_KEY == keyCode) {
- ctrlPressed = true;
- return;
- }
-
// common keys are processed firstly
- if (ctrlPressed && canvas.ARRANGE_WINDOWS_KEY == keyCode) {
+ if (canvas.ARRANGE_WINDOWS_KEY == keyCode) {
canvas.sendViaLocalConnection(canvas.vid_lc_name,
"arrangeWindows", null);
return;
}
@@ -191,12 +185,6 @@
]]>
</handler>
- <handler name="onkeyup" reference="lz.Keys" args="keyCode">
- if (canvas.CTRL_KEY == keyCode) {
- ctrlPressed = false;
- }
- </handler>
-
<screenSharingAdapter name="_screenSharingAdapter" />
<baseTabChatPanel name="_chatPanelStrict" labelid="616"
Modified: incubator/openmeetings/trunk/singlewebapp/docs/HotKeys.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/HotKeys.html?rev=1361901&r1=1361900&r2=1361901&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/HotKeys.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/HotKeys.html Mon Jul 16
03:57:31 2012
@@ -661,7 +661,7 @@ limitations under the License.
<tr>
<td bgcolor="#a0ddf0" colspan="" rowspan=""
valign="top" align="left">
<font color="#000000" size="-1" face="arial,helvetica,sanserif">
- Ctrl+F
+ F8 (code 119)
</font>
</td>
<td bgcolor="#a0ddf0" colspan="" rowspan=""
valign="top" align="left">
Modified: incubator/openmeetings/trunk/singlewebapp/xdocs/HotKeys.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/xdocs/HotKeys.xml?rev=1361901&r1=1361900&r2=1361901&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/xdocs/HotKeys.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/xdocs/HotKeys.xml Mon Jul 16
03:57:31 2012
@@ -29,7 +29,7 @@
<td>exclusive.audio.keycode</td>
</tr>
<tr>
- <td>Ctrl+F</td>
+ <td>F8 (code 119)</td>
<td>If 1 or 2 video windows are present
in the room they will be
"rearranged" to take all the
place available</td>
<td>No</td>