Changeset 398

Timestamp:

07/01/08 08:41:15 (2 months ago)

Author:

charles

Message:

fix swarm speed and ratio formatting bugs that were introduced during the RPC changes

Files:

• branches/rpc/web/javascript/torrent.js (modified) (8 diffs)
• branches/rpc/web/javascript/transmission.js (modified) (1 diff)

branches/rpc/web/javascript/torrent.js

@@ -130 +130 @@
-        peersDownloading: function() { return this._peers_downloading; },
-        peersUploading: function() { return this._peers_uploading; },
-        percentCompleted: function() { return this._percent_completed; },
-        size: function() { return this._size; },
-        state: function() { return this._state; },
@@ -260 +259 @@
-                this._completed         = data.haveUnchecked + data.haveValid;
-                this._verified          = data.haveValid;
-                this._percent_completed = 100 * this._completed / this._size;
-                this._download_total    = data.downloadedEver;
-                this._upload_total      = data.uploadedEver;
@@ -271 +269 @@
-                this._error_message     = data.errorString;
-                this._eta               = data.eta;
-_s
+S
-                this._total_leechers    = data.leechers;
-                this._total_seeders     = data.seeders;
@@ -301 +299 @@
-                
-                // Figure out the percent completed
-css_percent_completed = Math.floor(this._percent_completed * Torrent._MaxProgressBarWidth / 100)
-int_percent_completed = Math.floor(this._percent_completed
+percent_completed = this._completed / this._size
+css_completed_width = Math.floor(this._percent_completed * Torrent._MaxProgressBarWidth 
-                
-                // Sometimes get figures greater that the max
-percent_completed
-percent_completed
+completed_width
+completed_width
-                }
-                
-                // Add the progress bar
-
+
+
-                {
-                        // Add the decimals if the percentage is an integer
-                        if ((this._percent_completed % 1) == 0) {
-                                this._percent_completed = this._percent_completed + '.00';
-                        }
-                        // Create the 'progress details' label
-                        // Eg: '101 MB of 631 MB (16.02%) - 2 hr 30 min remaining'
-                        progress_details = Math.formatBytes(this._completed) + ' of ';
-                        progress_details += Math.formatBytes(this._size) + ' (';
-this._percent_completed
+Math.ratio( this._completed, this._size )
-                        if ((this._eta < 0 || this._eta >= Torrent._InfiniteTimeRemaining) && this.isActive()) {
-                                progress_details += ' - remaining time unknown';
@@ -332 +327 @@
-                        root._progress_complete_container.addClass('torrent_progress_bar');
-                        root._progress_complete_container.addClass(class_name);
-percent_completed
+completed_width
-                        
-                        // Update the 'incomplete' bar
@@ -339 +334 @@
-                                root._progress_incomplete_container.addClass('torrent_progress_bar in_progress');
-                        }
-percent_completed
+completed_width
-                        root._progress_incomplete_container.show();
-                        
@@ -370 +365 @@
-                        progress_details += Math.ratio(this._completed, this._size) + ')';
-                        
-    
+       
-                        root._progress_incomplete_container.hide();
-
+       
-                        // Set progress to maximum
-                        root._progress_complete_container.css('width', Torrent._MaxProgressBarWidth + '%');
@@ -503 +498 @@
-                        break;
-        }
-
+
-        if( sortDirection == Prefs._SortDescending )
-                torrents.reverse( );
-
+
-        return torrents;
-}

branches/rpc/web/javascript/transmission.js

@@ -889 +889 @@
-                $(ti+'secure')[0].innerHTML          = private_string;
-                $(ti+'creator_date')[0].innerHTML    = date_created;
-
-
+ * 100
+ * 100
-        },
-