summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsamhed <samuel@cendio.se>2016-04-26 19:13:35 +0200
committersamhed <samuel@cendio.se>2016-05-12 16:56:50 +0200
commitcd611a5326ed9053b94501c453f99fd24c7dfb11 (patch)
tree1a5cf6ed2699717a339909a1df399c354123eff9
parent4e471b5b55fa2272e3c72b0df8848dabc3196965 (diff)
downloadnovnc-cd611a5326ed9053b94501c453f99fd24c7dfb11.tar.gz
Renamed showExtraKeys to toggleExtraKeys
-rw-r--r--images/toggleextrakeys.png (renamed from images/showextrakeys.png)bin735 -> 735 bytes
-rw-r--r--include/base.css4
-rw-r--r--include/ui.js8
-rw-r--r--vnc.html4
4 files changed, 8 insertions, 8 deletions
diff --git a/images/showextrakeys.png b/images/toggleextrakeys.png
index ad8e0a7..ad8e0a7 100644
--- a/images/showextrakeys.png
+++ b/images/toggleextrakeys.png
Binary files differ
diff --git a/include/base.css b/include/base.css
index af28471..59e90c5 100644
--- a/include/base.css
+++ b/include/base.css
@@ -442,7 +442,7 @@ html {
margin-left: 0px;
}
-#showExtraKeysButton { display: none; }
+#toggleExtraKeysButton { display: none; }
#toggleCtrlButton { display: inline; }
#toggleAltButton { display: inline; }
#sendTabButton { display: inline; }
@@ -476,7 +476,7 @@ html {
padding-right: 0px;
}
/* collapse the extra keys on lower resolutions */
- #showExtraKeysButton {
+ #toggleExtraKeysButton {
display: inline;
}
#toggleCtrlButton {
diff --git a/include/ui.js b/include/ui.js
index 7287837..843f38f 100644
--- a/include/ui.js
+++ b/include/ui.js
@@ -211,7 +211,7 @@ var UI;
$D("keyboardinput").onblur = UI.keyInputBlur;
$D("keyboardinput").onsubmit = function () { return false; };
- $D("showExtraKeysButton").onclick = UI.showExtraKeys;
+ $D("toggleExtraKeysButton").onclick = UI.toggleExtraKeys;
$D("toggleCtrlButton").onclick = UI.toggleCtrl;
$D("toggleAltButton").onclick = UI.toggleAlt;
$D("sendTabButton").onclick = UI.sendTab;
@@ -1159,21 +1159,21 @@ var UI;
UI.hideKeyboardTimeout = setTimeout(function() { UI.setKeyboard(); },100);
},
- showExtraKeys: function() {
+ toggleExtraKeys: function() {
UI.keepKeyboard();
if(UI.extraKeysVisible === false) {
$D('toggleCtrlButton').style.display = "inline";
$D('toggleAltButton').style.display = "inline";
$D('sendTabButton').style.display = "inline";
$D('sendEscButton').style.display = "inline";
- $D('showExtraKeysButton').className = "noVNC_status_button_selected";
+ $D('toggleExtraKeysButton').className = "noVNC_status_button_selected";
UI.extraKeysVisible = true;
} else if(UI.extraKeysVisible === true) {
$D('toggleCtrlButton').style.display = "";
$D('toggleAltButton').style.display = "";
$D('sendTabButton').style.display = "";
$D('sendEscButton').style.display = "";
- $D('showExtraKeysButton').className = "noVNC_status_button";
+ $D('toggleExtraKeysButton').className = "noVNC_status_button";
UI.extraKeysVisible = false;
}
},
diff --git a/vnc.html b/vnc.html
index c0f242c..cdf45dc 100644
--- a/vnc.html
+++ b/vnc.html
@@ -74,8 +74,8 @@
autocorrect="off" autocomplete="off" spellcheck="false"
mozactionhint="Enter"></textarea>
<div id="noVNC_extra_keys">
- <input type="image" alt="Extra keys" src="images/showextrakeys.png"
- id="showExtraKeysButton" class="noVNC_status_button">
+ <input type="image" alt="Extra keys" src="images/toggleextrakeys.png"
+ id="toggleExtraKeysButton" class="noVNC_status_button">
<input type="image" alt="Ctrl" src="images/ctrl.png"
id="toggleCtrlButton" class="noVNC_status_button">
<input type="image" alt="Alt" src="images/alt.png"