Changeset 12834

Timestamp:

Sep 3, 2011, 7:10:03 AM (12 years ago)

Author:

jordan

Message:

avoid closures in Transmission.refilter, to prevent cyclic references

File:

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

trunk/web/javascript/transmission.js

@@ -972 +972 @@
 
 
-        onTorrentChanged: function(tor)
+        onTorrentChanged: function(ev, tor)
         {
                 // update our dirty fields
@@ -997 +997 @@
                         }
                         else {
-                                var tr = this;
                                 t = tr._torrents[id] = new Torrent(o);
                                 this.dirtyTorrents[id] = true;
-                                $(t).bind('dataChanged',function(ev,tor) {tr.onTorrentChanged(tor);});
+                                $(t).bind('dataChanged',$.proxy(this.onTorrentChanged,this));
                                 if(!('name' in t.fields) || !('status' in t.fields)) // missing some fields...
                                         needinfo.push(id);
@@ -1038 +1037 @@
         },
 
-        onRowClicked: function(ev, row)
-        {
+        onRowClicked: function(ev)
+        {
+                var row = ev.currentTarget.row;
+
                 // handle the per-row "torrent_resume" button
                 if (ev.target.className === 'torrent_resume') {
@@ -1512 +1513 @@
 
                 // remove the dirty rows from the dom
-                e = $.map(dirty_rows.slice(0), function(r) {
-                        return r.getElement();
-                });
+                e = [];
+                for (i=0; row=dirty_rows[i]; ++i)
+                        e.push (row.getElement());
                 $(e).detach();
 
@@ -1537 +1538 @@
                                 e.row = row;
                                 dirty_rows.push(row);
-                                var tr = this;
-                                $(e).click(function(ev){tr.onRowClicked(ev,ev.currentTarget.row);});
-                                $(e).dblclick(function(ev){tr.toggleInspector();});
+                                $(e).click($.proxy(this.onRowClicked,this));
+                                $(e).dblclick($.proxy(this.toggleInspector,this));
                         }
                 }
@@ -1587 +1587 @@
 
                 // jquery's even/odd starts with 1 not 0, so invert its logic
-                e = $.map(rows.slice(0), function(r){return r.getElement();});
-                $(e).filter(":odd").addClass('even');
-                $(e).filter(":even").removeClass('even');
+                for (i=0; row=rows[i]; ++i)
+                        $(row.getElement()).toggleClass('even',(i%2)!==0);
 
                 // sync gui