diff --git a/web/javascript/formatter.js b/web/javascript/formatter.js index e740d809f..a45492d7f 100644 --- a/web/javascript/formatter.js +++ b/web/javascript/formatter.js @@ -133,6 +133,16 @@ Transmission.fmt = (function() : convertedSize.toTruncFixed(1) + ' ' + unit; }, + speedBps: function( Bps ) + { + return this.speed( this.toKBps( Bps ) ); + }, + + toKBps: function( Bps ) + { + return Math.floor( Bps / speed_K ); + }, + speed: function( KBps ) { var speed = KBps; diff --git a/web/javascript/torrent.js b/web/javascript/torrent.js index 3d18cae12..e3c11dbdc 100644 --- a/web/javascript/torrent.js +++ b/web/javascript/torrent.js @@ -435,10 +435,10 @@ Torrent.prototype = }, formatUL: function() { - return 'UL: ' + Transmission.fmt.speed(this._upload_speed); + return 'UL: ' + Transmission.fmt.speedBps(this._upload_speed); }, formatDL: function() { - return 'DL: ' + Transmission.fmt.speed(this._download_speed); + return 'DL: ' + Transmission.fmt.speedBps(this._download_speed); }, getPeerDetails: function() diff --git a/web/javascript/transmission.js b/web/javascript/transmission.js index acd6a2cfd..b658a6694 100644 --- a/web/javascript/transmission.js +++ b/web/javascript/transmission.js @@ -1320,8 +1320,8 @@ Transmission.prototype = setInnerHTML( tab.pieces, pieces ); setInnerHTML( tab.hash, hash ); setInnerHTML( tab.state, total_state ); - setInnerHTML( tab.download_speed, torrents.length ? Transmission.fmt.speed( total_download_speed ) : na ); - setInnerHTML( tab.upload_speed, torrents.length ? Transmission.fmt.speed( total_upload_speed ) : na ); + setInnerHTML( tab.download_speed, torrents.length ? Transmission.fmt.speedBps( total_download_speed ) : na ); + setInnerHTML( tab.upload_speed, torrents.length ? Transmission.fmt.speedBps( total_upload_speed ) : na ); setInnerHTML( tab.uploaded, torrents.length ? Transmission.fmt.size( total_upload ) : na ); setInnerHTML( tab.downloaded, torrents.length ? Transmission.fmt.size( total_download ) : na ); setInnerHTML( tab.availability, torrents.length ? Transmission.fmt.percentString(Math.ratio( total_availability*100, sizeWhenDone )) + '%' : na ); @@ -1392,8 +1392,8 @@ Transmission.prototype = var parity = ((i+1) % 2 == 0 ? 'even' : 'odd'); html += ''; html += '' + (peer.isEncrypted ? 'Encrypted' : '') + ''; - html += '' + ( peer.rateToPeer ? Transmission.fmt.speed(peer.rateToPeer) : '' ) + ''; - html += '' + ( peer.rateToClient ? Transmission.fmt.speed(peer.rateToClient) : '' ) + ''; + html += '' + ( peer.rateToPeer ? Transmission.fmt.speedBps(peer.rateToPeer) : '' ) + ''; + html += '' + ( peer.rateToClient ? Transmission.fmt.speedBps(peer.rateToClient) : '' ) + ''; html += '' + Math.floor(peer.progress*100) + '%' + ''; html += '' + peer.flagStr + ''; html += '' + peer.address + ''; @@ -1761,12 +1761,12 @@ Transmission.prototype = setInnerHTML( $('#torrent_global_transfer')[0], s ); // update the speeds - s = Transmission.fmt.speed( upSpeed ); + s = Transmission.fmt.speedBps( upSpeed ); if( iPhone ) s = 'UL: ' + s; setInnerHTML( $('#torrent_global_upload')[0], s ); // download speeds - s = Transmission.fmt.speed( downSpeed ); + s = Transmission.fmt.speedBps( downSpeed ); if( iPhone ) s = 'DL: ' + s; setInnerHTML( $('#torrent_global_download')[0], s ); },