Changeset 8895

Timestamp:

Aug 12, 2009, 2:53:45 AM (13 years ago)

Author:

kjg

Message:

(trunk web) refactor sendTorrentCommand in my quest to allow remote.js to stand on its own

This also happens to fix #2322. Before, the callback would only update
recently-active torrents. Now it updates all affected torrents.

Location:

trunk/web/javascript

Files:

• transmission.js (modified) (4 diffs)
• transmission.remote.js (modified) (2 diffs)

trunk/web/javascript/transmission.js

@@ -1382 +1382 @@
 
         removeTorrents: function( torrents ) {
-                this.remote.removeTorrents( torrents );
+                var torrent_ids = jQuery.map(torrents, function(t) { return t.id(); } );
+                var tr = this;
+                this.remote.removeTorrents( torrent_ids, function(){ tr.refreshTorrents() } );
         },
 
@@ -1403 +1405 @@
         },
         startTorrents: function( torrents ) {
-                this.remote.startTorrents( torrents );
+                var torrent_ids = jQuery.map(torrents, function(t) { return t.id(); } );
+                var tr = this;
+                this.remote.startTorrents( torrent_ids, function(){ tr.refreshTorrents(torrent_ids) } );
         },
         verifyTorrent: function( torrent ) {
@@ -1409 +1413 @@
         },
         verifyTorrents: function( torrents ) {
-                this.remote.verifyTorrents( torrents );
+                var torrent_ids = jQuery.map(torrents, function(t) { return t.id(); } );
+                var tr = this;
+                this.remote.verifyTorrents( torrent_ids, function(){ tr.refreshTorrents(torrent_ids) } );
         },
     
@@ -1422 +1428 @@
         },
         stopTorrents: function( torrents ) {
-                this.remote.stopTorrents( torrents );
+                var torrent_ids = jQuery.map(torrents, function(t) { return t.id(); } );
+                var tr = this;
+                this.remote.stopTorrents( torrent_ids,  function(){ tr.refreshTorrents(torrent_ids )} );
         },
         changeFileCommand: function(command, torrent, file) {

trunk/web/javascript/transmission.remote.js

@@ -147 +147 @@
         },
         
-        sendTorrentCommand: function( method, torrents ) {
-                var remote = this;
+        sendTorrentActionRequests: function( method, torrent_ids, callback ) {
                 var o = {
                         method: method,
-                        arguments: { ids: [ ] }
-                };
+                        arguments: { ids: torrent_ids }
+                };
+
+                this.sendRequest( o, function( data ) {
+                        callback();
+                });
+        },
+        
+        startTorrents: function( torrent_ids, callback ) {
+                this.sendTorrentActionRequests( 'torrent-start', torrent_ids, callback );
+        },
+        stopTorrents: function( torrent_ids, callback ) {
+                this.sendTorrentActionRequests( 'torrent-stop', torrent_ids, callback );
+        },
+        removeTorrents: function( torrent_ids, callback ) {
+                this.sendTorrentActionRequests( 'torrent-remove', torrent_ids, callback );
+        },
+        removeTorrentsAndData: function( torrents ) {
+                var remote = this;
+                var o = {
+                        method: 'torrent-remove',
+                        arguments: {
+                                'delete-local-data': true,
+                                ids: [ ]
+                        }
+                };
+
                 if( torrents != null )
                         for( var i=0, len=torrents.length; i<len; ++i )
@@ -160 +184 @@
                 } );
         },
-        
-        startTorrents: function( torrents ) {
-                this.sendTorrentCommand( 'torrent-start', torrents );
-        },
-        stopTorrents: function( torrents ) {
-                this.sendTorrentCommand( 'torrent-stop', torrents );
-        },
-        removeTorrents: function( torrents ) {
-                this.sendTorrentCommand( 'torrent-remove', torrents );
-        },
-        removeTorrentsAndData: function( torrents ) {
-                var remote = this;
-                var o = {
-                        method: 'torrent-remove',
-                        arguments: {
-                                'delete-local-data': true,
-                                ids: [ ]
-                        }
-                };
-
-                if( torrents != null )
-                        for( var i=0, len=torrents.length; i<len; ++i )
-                                o.arguments.ids.push( torrents[i].id() );
-                this.sendRequest( o, function( ) {
-                        remote._controller.refreshTorrents();
-                } );
-        },
-        verifyTorrents: function( torrents ) {
-                this.sendTorrentCommand( 'torrent-verify', torrents );
+        verifyTorrents: function( torrent_ids, callback ) {
+                this.sendTorrentActionRequests( 'torrent-verify', torrent_ids, callback );
         },
         addTorrentByUrl: function( url, options ) {