Changeset 6401 for trunk

Timestamp:

Jul 25, 2008, 2:34:25 PM (14 years ago)

Author:

charles

Message:

(clutch) #1109: “UL To” and “DL From” are switched in torrent inspector and peer details

Location:

trunk/web/javascript

Files:

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

trunk/web/javascript/torrent.js

@@ -127 +127 @@
         isSeeding: function() { return this.state() == Torrent._StatusSeeding; },
         name: function() { return this._name; },
-        peersDownloading: function() { return this._peers_downloading; },
-        peersUploading: function() { return this._peers_uploading; },
+        peersSendingToUs: function() { return this._peers_sending_to_us; },
+        peersGettingFromUs: function() { return this._peers_getting_from_us; },
         getPercentDone: function() {
                 if( !this._sizeWhenDone ) return 1.0;
@@ -272 +272 @@
                 
                 // Set the regularly-changing torrent variables
-                this._id                = data.id;
-                this._completed         = data.haveUnchecked + data.haveValid;
-                this._verified          = data.haveValid;
-                this._download_total    = data.downloadedEver;
-                this._upload_total      = data.uploadedEver;
-                this._download_speed    = data.rateDownload;
-                this._upload_speed      = data.rateUpload;
-                this._peers_downloading = data.peersGettingFromUs;
-                this._peers_uploading   = data.peersSendingToUs;
-                this._peers_total       = data.peersKnown;
-                this._error             = data.error;
-                this._error_message     = data.errorString;
-                this._eta               = data.eta;
-                this._swarm_speed       = data.swarmSpeed;
-                this._total_leechers    = Math.max( 0, data.leechers );
-                this._total_seeders     = Math.max( 0, data.seeders );
-                this._state             = data.status;
+                this._id                    = data.id;
+                this._completed             = data.haveUnchecked + data.haveValid;
+                this._verified              = data.haveValid;
+                this._download_total        = data.downloadedEver;
+                this._upload_total          = data.uploadedEver;
+                this._download_speed        = data.rateDownload;
+                this._upload_speed          = data.rateUpload;
+                this._peers_getting_from_us = data.peersGettingFromUs;
+                this._peers_sending_to_us   = data.peersSendingToUs;
+                this._peers_total           = data.peersKnown;
+                this._error                 = data.error;
+                this._error_message         = data.errorString;
+                this._eta                   = data.eta;
+                this._swarm_speed           = data.swarmSpeed;
+                this._total_leechers        = Math.max( 0, data.leechers );
+                this._total_seeders         = Math.max( 0, data.seeders );
+                this._state                 = data.status;
         },
 
@@ -351 +351 @@
                         else {
                                 peer_details = 'Downloading from '
-                                             + this._peers_downloading
+                                             + this.peersSendingToUs()
                                              + ' of '
                                              + this._peers_total
@@ -391 +391 @@
                         else
                                 peer_details = 'Seeding to '
-                                             + this._peers_uploading
+                                             + this.peersGettingFromUs()
                                              + ' of '
                                              + this._peers_total

trunk/web/javascript/transmission.js

@@ -864 +864 @@
                         total_seeders        += t.totalSeeders();
                         total_leechers       += t.totalLeechers();
-                        total_upload_peers   += t.peersUploading();
-                        total_download_peers += t.peersDownloading();
+                        total_upload_peers   += t.peersGettingFromUs();
+                        total_download_peers += t.peersSendingToUs();
                         total_swarm_speed    += t.swarmSpeed();
                         if( total_state == null )