haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #129 from fouksf/keyboard-shortcuts 

Fixes bug with shortcuts enabled when writing display name.
This commit is contained in:
hristoterezov 2014-09-15 15:06:23 +03:00
parent 092e8df148 69c576b1d9
commit 99b673247c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
index.html
View File

@ -44,7 +44,7 @@
<script src="analytics.js?v=1"></script><!-- google analytics plugin -->
<script src="rtp_sts.js?v=1"></script><!-- RTP stats processing -->
<script src="local_sts.js?v=1"></script><!-- Local stats processing -->
<script src="videolayout.js?v=8"></script><!-- video ui -->
<script src="videolayout.js?v=9"></script><!-- video ui -->
<script src="toolbar.js?v=5"></script><!-- toolbar ui -->
<script src="toolbar_toggler.js?v=1"></script>
<script src="canvas_util.js?v=1"></script><!-- canvas drawing utils -->
@ -52,7 +52,7 @@
<script src="media_stream.js?v=1"></script><!-- media stream -->
<script src="bottom_toolbar.js?v=2"></script><!-- media stream -->
<script src="roomname_generator.js?v=1"></script><!-- generator for random room names -->
<script src="keyboard_shortcut.js?v=1"></script>
<script src="keyboard_shortcut.js?v=2"></script>
<script src="tracking.js?v=1"></script><!-- tracking -->
<link href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" rel="stylesheet">
<link rel="stylesheet" href="css/font.css?v=4"/>

7
keyboard_shortcut.js
View File

@ -32,14 +32,13 @@ var KeyboardShortcut = (function(my) {
};
window.onkeyup = function(e) {
if($("#chatspace").css("display") === "none" ||
!($("#usermsg").is(":focus") || $("#nickinput").is(":focus"))) {
if(!($(":focus").is("input[type=text]") || $(":focus").is("textarea"))) {
var keycode = e.which;
if (typeof shortcuts[keycode] === "object") {
shortcuts[keycode].function();
} else if (keycode >= "1".charCodeAt(0) && keycode <= "9".charCodeAt(0)) {
} else if (keycode >= "0".charCodeAt(0) && keycode <= "9".charCodeAt(0)) {
var remoteVideos = $(".videocontainer:not(#mixedstream)"),
videoWanted = keycode - "0".charCodeAt(0);
videoWanted = (keycode - "0".charCodeAt(0) + 1) % 10;
if (remoteVideos.length > videoWanted) {
remoteVideos[videoWanted].click();
}

1
videolayout.js
View File

@ -546,6 +546,7 @@ var VideoLayout = (function (my) {
var editableText = document.createElement('input');
editableText.className = 'displayname';
editableText.type = 'text';
editableText.id = 'editDisplayName';
if (displayName && displayName.length) {