Changeset 8529

Timestamp:

May 25, 2009, 3:46:25 PM (14 years ago)

Author:

charles

Message:

(trunk web) elminate a right-click bind() for the Torrents in the transfer list

Location:

trunk/web/javascript

Files:

• torrent.js (modified) (4 diffs)
• transmission.js (modified) (1 diff)

trunk/web/javascript/torrent.js

@@ -44 +44 @@
                 top_e.className = 'torrent';
                 top_e.id = 'torrent_' + data.id;
+                top_e._torrent = this;
                 var element = $(top_e);
                 element._torrent = this;
@@ -95 +96 @@
                 // Set the torrent click observer
                 element.bind('click', {element: element}, this.clickTorrent);
-                if (!iPhone) element.bind('contextmenu', {element: element}, this.rightClickTorrent);           
                 
                 // Safari hack - first torrent needs to be moved down for some reason. Seems to be ok when
@@ -148 +148 @@
                 this._element = element;
                 element._torrent = this;
+                element[0]._torrent = this;
                 this.refreshHTML( );
         },
@@ -207 +208 @@
          * 
          *--------------------------------------------*/
-        
-        /*
-         * Process a right-click event on this torrent
-         */
-        rightClickTorrent: function(event)
-        {
-                // don't stop the event! need it for the right-click menu
-                
-                var t = event.data.element._torrent;
-                if ( !t.isSelected( ) )
-                        t._controller.setSelectedTorrent( t );
-        },
         
         /*

trunk/web/javascript/transmission.js

@@ -289 +289 @@
                         boundingElement:   $('div#torrent_container'),
                         boundingRightPad:  20,
-                        boundingBottomPad: 5
+                        boundingBottomPad: 5,
+                        onContextMenu:     function(e) { 
+                                tr.setSelectedTorrent( $(e.target).closest('.torrent')[0]._torrent, true ); 
+                                return true; 
+                        }
                 });
         },