(trunk web) remove all references to tracker as it no longer exists in this fashion. fixes #2509

This commit is contained in:
Kevin Glowacz
2009-10-31 02:19:38 +00:00
parent e8aa2f0335
commit f6c6ebdf70
3 changed files with 2 additions and 23 deletions

View File

@@ -80,8 +80,6 @@
<div class="inspector_group"> <div class="inspector_group">
<div class="inspector_group_label">Information</div> <div class="inspector_group_label">Information</div>
<div class="inspector_row"> <div class="inspector_row">
<div class="inspector_label">Tracker:</div>
<div id="torrent_inspector_tracker"></div>
</div> </div>
<div class="inspector_row"> <div class="inspector_row">
<div class="inspector_label">Hash:</div> <div class="inspector_label">Hash:</div>
@@ -334,7 +332,6 @@
<li id="sort_by_percent_completed">Progress</li> <li id="sort_by_percent_completed">Progress</li>
<li id="sort_by_queue_order">Queue Order</li> <li id="sort_by_queue_order">Queue Order</li>
<li id="sort_by_state">State</li> <li id="sort_by_state">State</li>
<li id="sort_by_tracker">Tracker</li>
<li class="separator"></li> <li class="separator"></li>
<li id="reverse_sort_order">Reverse Sort Order</li> <li id="reverse_sort_order">Reverse Sort Order</li>
</ul> </ul>

View File

@@ -27,8 +27,8 @@ Torrent._ErrTrackerWarning = 1;
Torrent._ErrTrackerError = 2; Torrent._ErrTrackerError = 2;
Torrent._ErrLocalError = 3; Torrent._ErrLocalError = 3;
Torrent._StaticFields = [ 'addedDate', 'announceURL', 'comment', 'creator', Torrent._StaticFields = [ 'addedDate', 'comment', 'creator', 'dateCreated',
'dateCreated', 'hashString', 'id', 'isPrivate', 'name', 'totalSize' ] 'hashString', 'id', 'isPrivate', 'name', 'totalSize' ]
Torrent._DynamicFields = [ 'downloadedEver', 'error', 'errorString', 'eta', Torrent._DynamicFields = [ 'downloadedEver', 'error', 'errorString', 'eta',
'haveUnchecked', 'haveValid', 'leftUntilDone', 'peersConnected', 'haveUnchecked', 'haveValid', 'leftUntilDone', 'peersConnected',
'peersGettingFromUs', 'peersSendingToUs', 'rateDownload', 'rateUpload', 'peersGettingFromUs', 'peersSendingToUs', 'rateDownload', 'rateUpload',
@@ -46,7 +46,6 @@ Torrent.prototype =
this._hashString = data.hashString; this._hashString = data.hashString;
this._date = data.addedDate; this._date = data.addedDate;
this._size = data.totalSize; this._size = data.totalSize;
this._tracker = data.announceURL;
this._comment = data.comment; this._comment = data.comment;
this._creator = data.creator; this._creator = data.creator;
this._creator_date = data.dateCreated; this._creator_date = data.dateCreated;
@@ -614,11 +613,6 @@ Torrent.compareByName = function( a, b ) {
return a._name_lc.compareTo( b._name_lc ); return a._name_lc.compareTo( b._name_lc );
}; };
/** Helper function for sortTorrents(). */
Torrent.compareByTracker = function( a, b ) {
return a._tracker.compareTo( b._tracker );
};
/** Helper function for sortTorrents(). */ /** Helper function for sortTorrents(). */
Torrent.compareByState = function( a, b ) { Torrent.compareByState = function( a, b ) {
return a.state() - b.state(); return a.state() - b.state();
@@ -662,9 +656,6 @@ Torrent.sortTorrents = function( torrents, sortMethod, sortDirection )
case Prefs._SortByState: case Prefs._SortByState:
torrents.sort( this.compareByState ); torrents.sort( this.compareByState );
break; break;
case Prefs._SortByTracker:
torrents.sort( this.compareByTracker );
break;
case Prefs._SortByName: case Prefs._SortByName:
torrents.sort( this.compareByName ); torrents.sort( this.compareByName );
break; break;

View File

@@ -98,7 +98,6 @@ Transmission.prototype =
this._inspector._info_tab.size = $(ti+'size')[0]; this._inspector._info_tab.size = $(ti+'size')[0];
this._inspector._info_tab.state = $(ti+'state')[0]; this._inspector._info_tab.state = $(ti+'state')[0];
this._inspector._info_tab.swarm_speed = $(ti+'swarm_speed')[0]; this._inspector._info_tab.swarm_speed = $(ti+'swarm_speed')[0];
this._inspector._info_tab.tracker = $(ti+'tracker')[0];
this._inspector._info_tab.uploaded = $(ti+'uploaded')[0]; this._inspector._info_tab.uploaded = $(ti+'uploaded')[0];
this._inspector._info_tab.upload_speed = $(ti+'upload_speed')[0]; this._inspector._info_tab.upload_speed = $(ti+'upload_speed')[0];
this._inspector._info_tab.upload_to = $(ti+'upload_to')[0]; this._inspector._info_tab.upload_to = $(ti+'upload_to')[0];
@@ -937,7 +936,6 @@ Transmission.prototype =
var total_size = 0; var total_size = 0;
var total_state = null; var total_state = null;
var total_swarm_speed = 0; var total_swarm_speed = 0;
var total_tracker = null;
var total_upload = 0; var total_upload = 0;
var total_upload_peers = 0; var total_upload_peers = 0;
var total_upload_speed = 0; var total_upload_speed = 0;
@@ -951,7 +949,6 @@ Transmission.prototype =
{ {
setInnerHTML( tab.name, 'No Selection' ); setInnerHTML( tab.name, 'No Selection' );
setInnerHTML( tab.size, na ); setInnerHTML( tab.size, na );
setInnerHTML( tab.tracker, na );
setInnerHTML( tab.hash, na ); setInnerHTML( tab.hash, na );
setInnerHTML( tab.state, na ); setInnerHTML( tab.state, na );
setInnerHTML( tab.download_speed, na ); setInnerHTML( tab.download_speed, na );
@@ -1012,11 +1009,6 @@ Transmission.prototype =
total_state = t.stateStr(); total_state = t.stateStr();
else if ( total_state.search ( t.stateStr() ) == -1 ) else if ( total_state.search ( t.stateStr() ) == -1 )
total_state += '/' + t.stateStr(); total_state += '/' + t.stateStr();
var tracker = t._tracker;
if( total_tracker == null )
total_tracker = tracker;
else if ( total_tracker.search ( tracker ) == -1 )
total_tracker += ', ' + tracker;
if( t._is_private ) if( t._is_private )
have_private = true; have_private = true;
else else
@@ -1030,7 +1022,6 @@ Transmission.prototype =
setInnerHTML( tab.name, name ); setInnerHTML( tab.name, name );
setInnerHTML( tab.size, torrents.length ? Math.formatBytes( total_size ) : na ); setInnerHTML( tab.size, torrents.length ? Math.formatBytes( total_size ) : na );
//setInnerHTML( tab.tracker, total_tracker.replace(/\//g, '/&#8203;') );
setInnerHTML( tab.hash, hash ); setInnerHTML( tab.hash, hash );
setInnerHTML( tab.state, total_state ); setInnerHTML( tab.state, total_state );
setInnerHTML( tab.download_speed, torrents.length ? Math.formatBytes( total_download_speed ) + '/s' : na ); setInnerHTML( tab.download_speed, torrents.length ? Math.formatBytes( total_download_speed ) + '/s' : na );