mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-02-20 21:26:53 +00:00
Code Issues Releases Wiki Activity

(trunk web) fix event propagation in keypress events

Browse source
This commit is contained in:
Jordan Lee 2011-08-28 16:33:22 +00:00
parent f8195180ba
commit 6d4a7a2f10
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
web/javascript/transmission.js
View file

@ -66,7 +66,7 @@ Transmission.prototype =
// tell jQuery to copy the dataTransfer property from events over if it exists // tell jQuery to copy the dataTransfer property from events over if it exists
jQuery.event.props.push("dataTransfer"); jQuery.event.props.push("dataTransfer");
$(document).delegate('#torrent_list > li', 'click', function(ev) {tr.setSelectedRow(ev.currentTarget.row);}); $(document).delegate('#torrent_list > li', 'click', function(ev) {tr.onRowClicked(ev,ev.currentTarget.row);});
$(document).delegate('#torrent_list > li', 'dblclick', function(e) {tr.toggleInspector();}); $(document).delegate('#torrent_list > li', 'dblclick', function(e) {tr.toggleInspector();});
$('#torrent_upload_form').submit(function() { $('#upload_confirm_button').click(); return false; }); $('#torrent_upload_form').submit(function() { $('#upload_confirm_button').click(); return false; });
@ -75,9 +75,9 @@ Transmission.prototype =
$('#inspector_close').bind('click', function() { tr.setInspectorVisible(false); }); $('#inspector_close').bind('click', function() { tr.setInspectorVisible(false); });
$('#preferences_link').bind('click', function(e) { tr.releaseClutchPreferencesButton(e); }); $('#preferences_link').bind('click', function(e) { tr.releaseClutchPreferencesButton(e); });
} else { } else {
$(document).bind('keydown', function(e) { tr.keyDown(e); }); $(document).bind('keydown', function(e) { return tr.keyDown(e); });
$(document).bind('keyup', function(e) { tr.keyUp(e); }); $(document).bind('keyup', function(e) { tr.keyUp(e); });
$('#torrent_container').click(function() { tr.deselectAll(); }); $(document).delegate('#torrent_container', 'click', function() { tr.deselectAll(); });
$('#inspector_link').click(function(e) { tr.toggleInspector(); }); $('#inspector_link').click(function(e) { tr.toggleInspector(); });
this.setupSearchBox(); this.setupSearchBox();
@ -480,7 +480,8 @@ Transmission.prototype =
*/ */
keyDown: function(ev) keyDown: function(ev)
{ {
var up = ev.keyCode === 38; // up key pressed var handled = false,
up = ev.keyCode === 38; // up key pressed
dn = ev.keyCode === 40, // down key pressed dn = ev.keyCode === 40, // down key pressed
shift = ev.keyCode === 16; // shift key pressed shift = ev.keyCode === 16; // shift key pressed
@ -522,11 +523,14 @@ Transmission.prototype =
} }
this._last_torrent_clicked = r.getTorrentId(); this._last_torrent_clicked = r.getTorrentId();
this.scrollToRow(r); this.scrollToRow(r);
handled = true;
} }
else if (shift) else if (shift)
{ {
this._shift_index = this.indexOfLastTorrent(); this._shift_index = this.indexOfLastTorrent();
} }
return !handled;
}, },
keyUp: function(ev) keyUp: function(ev)