apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

use same command machenism for routing UI command with Japanese keyboard change

Browse Source
This commit is contained in:
Kelven Yang 2011-05-06 15:14:26 -07:00
parent 2069d758e7
commit 7bc9165a9a
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
console-proxy/css/ajaxviewer.css
View File

@ -71,7 +71,8 @@ body {
#toolbar ul li ul { #toolbar ul li ul {
position: absolute; position: absolute;
top:32; top:32;
display: block none; display: block;
display: none;
border-top: 1px solid black; border-top: 1px solid black;
background-image:url(/resource/images/back.gif); background-image:url(/resource/images/back.gif);
background-repeat:repeat-x repeat-y; background-repeat:repeat-x repeat-y;

8
console-proxy/js/ajaxviewer.js
View File

@ -292,6 +292,14 @@ AjaxViewer.prototype = {
} else if(cmd == "keyboard_en") { } else if(cmd == "keyboard_en") {
$("#toolbar").find(".pulldown").find("ul").hide(); $("#toolbar").find(".pulldown").find("ul").hide();
this.currentKeyboard = 0; this.currentKeyboard = 0;
} else if(cmd == "sendCtrlAltDel") {
this.sendKeyboardEvent(ajaxViewer.KEY_DOWN, 45, ajaxViewer.CTRL_KEY | ajaxViewer.ALT_KEY);
this.sendKeyboardEvent(ajaxViewer.KEY_UP, 45, ajaxViewer.CTRL_KEY | ajaxViewer.ALT_KEY);
} else if(cmd == "sendCtrlEsc") {
this.sendKeyboardEvent(ajaxViewer.KEY_DOWN, 17, 0);
this.sendKeyboardEvent(ajaxViewer.KEY_DOWN, 27, ajaxViewer.CTRL_KEY);
this.sendKeyboardEvent(ajaxViewer.KEY_UP, 27, ajaxViewer.CTRL_KEY);
this.sendKeyboardEvent(ajaxViewer.KEY_UP, 17, 0);
} }
}, },

6
console-proxy/src/com/cloud/consoleproxy/ConsoleProxyViewer.java
View File

@ -1023,12 +1023,12 @@ public class ConsoleProxyViewer implements java.lang.Runnable, RfbViewer, RfbPro
"<div id=\"toolbar\">", "<div id=\"toolbar\">",
"<ul>", "<ul>",
"<li>", "<li>",
"<a href=\"#\" onclick=\"javascript:sendCtrlAltDel();\">", "<a href=\"#\" cmd=\"sendCtrlAltDel\">",
"<span><img align=\"left\" src=\"/resource/images/cad.gif\" alt=\"Ctrl-Alt-Del\" />Ctrl-Alt-Del</span>", "<span><img align=\"left\" src=\"/resource/images/cad.gif\" alt=\"Ctrl-Alt-Del\" />Ctrl-Alt-Del</span>",
"</a>", "</a>",
"</li>", "</li>",
"<li>", "<li>",
"<a href=\"#\" onclick=\"javascript:sendCtrlEsc();\">", "<a href=\"#\" cmd=\"sendCtrlEsc\">",
"<span><img align=\"left\" src=\"/resource/images/winlog.png\" alt=\"Ctrl-Esc\" style=\"width:16px;height:16px\"/>Ctrl-Esc</span>", "<span><img align=\"left\" src=\"/resource/images/winlog.png\" alt=\"Ctrl-Esc\" style=\"width:16px;height:16px\"/>Ctrl-Esc</span>",
"</a>", "</a>",
"</li>", "</li>",
@ -1038,7 +1038,7 @@ public class ConsoleProxyViewer implements java.lang.Runnable, RfbViewer, RfbPro
"<span><img align=\"left\" src=\"/resource/images/winlog.png\" alt=\"Keyboard\" style=\"width:16px;height:16px\"/>Keyboard</span>", "<span><img align=\"left\" src=\"/resource/images/winlog.png\" alt=\"Keyboard\" style=\"width:16px;height:16px\"/>Keyboard</span>",
"</a>", "</a>",
"<ul>", "<ul>",
"<li class=\"current\"><a href=\"#\" cmd=\"keyboard_en\"><span>English (US)</span></a></li>", "<li><a href=\"#\" cmd=\"keyboard_en\"><span>English (US)</span></a></li>",
"<li><a href=\"#\" cmd=\"keyboard_jp\"><span>Japanese&nbsp;&nbsp;&nbsp;</span></a></li>", "<li><a href=\"#\" cmd=\"keyboard_jp\"><span>Japanese&nbsp;&nbsp;&nbsp;</span></a></li>",
"</ul>", "</ul>",
"</li>", "</li>",