Changeset 12784

Timestamp:

Aug 28, 2011, 4:33:22 PM (11 years ago)

Author:

jordan

Message:

(trunk web) fix event propagation in keypress events

File:

• trunk/web/javascript/transmission.js (modified) (5 diffs)

trunk/web/javascript/transmission.js

@@ -67 +67 @@
                 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();});
         
@@ -76 +76 @@
                         $('#preferences_link').bind('click', function(e) { tr.releaseClutchPreferencesButton(e); });
                 } else {
-                        $(document).bind('keydown',  function(e) { tr.keyDown(e); });
-                        $(document).bind('keyup',  function(e) { tr.keyUp(e); });
-                        $('#torrent_container').click(function() { tr.deselectAll(); });
+                        $(document).bind('keydown', function(e) { return tr.keyDown(e); });
+                        $(document).bind('keyup', function(e) { tr.keyUp(e); });
+                        $(document).delegate('#torrent_container', 'click', function() { tr.deselectAll(); });
                         $('#inspector_link').click(function(e) { tr.toggleInspector(); });
 
@@ -481 +481 @@
         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
                     shift = ev.keyCode === 16; // shift key pressed
@@ -523 +524 @@
                         this._last_torrent_clicked = r.getTorrentId();
                         this.scrollToRow(r);
+                        handled = true;
                 }
                 else if (shift)
@@ -528 +530 @@
                         this._shift_index = this.indexOfLastTorrent();
                 }
+
+                return !handled;
         },