natalie/indefero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'release-1.3' into develop

Browse Source
This commit is contained in:
Thomas Keller
2012-11-19 00:17:01 +01:00
parent 02613203c9 6f4af6b68d
commit 3cc14ef6a0
9 changed files with 1143 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
www/media/idf/js/jquery.hotkeys.js
View File

@@ -44,7 +44,7 @@
handleObj.handler = function( event ) {
// Don't fire in text-accepting inputs that we didn't directly bind to
if ( this !== event.target && (/textarea|select/i.test( event.target.nodeName ) ||
if ( this !== event.target && (/textarea|select|input/i.test( event.target.nodeName ) ||
event.target.type === "text" || $(event.target).prop('contenteditable') == 'true' )) {
return;
}