From f6c6ebdf702570390c0ed00449b5fe6ff4f79663 Mon Sep 17 00:00:00 2001
From: Kevin Glowacz <kevin@glowacz.info>
Date: Sat, 31 Oct 2009 02:19:38 +0000
Subject: [PATCH] (trunk web) remove all references to tracker as it no longer
 exists in this fashion. fixes #2509

---
 web/index.html                 |  3 ---
 web/javascript/torrent.js      | 13 ++-----------
 web/javascript/transmission.js |  9 ---------
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/web/index.html b/web/index.html
index 174c68178..77145a9a3 100755
--- a/web/index.html
+++ b/web/index.html
@@ -80,8 +80,6 @@
 				<div class="inspector_group">
 					<div class="inspector_group_label">Information</div>
 					<div class="inspector_row">
-						<div class="inspector_label">Tracker:</div>
-						<div id="torrent_inspector_tracker"></div>
 					</div>
 					<div class="inspector_row">
 						<div class="inspector_label">Hash:</div>
@@ -334,7 +332,6 @@
 								<li id="sort_by_percent_completed">Progress</li>
 								<li id="sort_by_queue_order">Queue Order</li>
 								<li id="sort_by_state">State</li>
-								<li id="sort_by_tracker">Tracker</li>
 								<li class="separator"></li>
 								<li id="reverse_sort_order">Reverse Sort Order</li>
 							</ul>
diff --git a/web/javascript/torrent.js b/web/javascript/torrent.js
index 988c7f292..f44afaed0 100644
--- a/web/javascript/torrent.js
+++ b/web/javascript/torrent.js
@@ -27,8 +27,8 @@ Torrent._ErrTrackerWarning     = 1;
 Torrent._ErrTrackerError       = 2;
 Torrent._ErrLocalError         = 3;
 
-Torrent._StaticFields = [ 'addedDate', 'announceURL', 'comment', 'creator',
-    'dateCreated', 'hashString', 'id', 'isPrivate', 'name', 'totalSize' ]
+Torrent._StaticFields = [ 'addedDate', 'comment', 'creator', 'dateCreated',
+		'hashString', 'id', 'isPrivate', 'name', 'totalSize' ]
 Torrent._DynamicFields = [ 'downloadedEver', 'error', 'errorString', 'eta',
     'haveUnchecked', 'haveValid', 'leftUntilDone', 'peersConnected',
     'peersGettingFromUs', 'peersSendingToUs', 'rateDownload', 'rateUpload',
@@ -46,7 +46,6 @@ Torrent.prototype =
 		this._hashString    = data.hashString;
 		this._date          = data.addedDate;
 		this._size          = data.totalSize;
-		this._tracker       = data.announceURL;
 		this._comment       = data.comment;
 		this._creator       = data.creator;
 		this._creator_date  = data.dateCreated;
@@ -614,11 +613,6 @@ Torrent.compareByName = function( a, b ) {
 	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(). */
 Torrent.compareByState = function( a, b ) {
 	return a.state() - b.state();
@@ -662,9 +656,6 @@ Torrent.sortTorrents = function( torrents, sortMethod, sortDirection )
 		case Prefs._SortByState:
 			torrents.sort( this.compareByState );
 			break;
-		case Prefs._SortByTracker:
-			torrents.sort( this.compareByTracker );
-			break;
 		case Prefs._SortByName:
 			torrents.sort( this.compareByName );
 			break;
diff --git a/web/javascript/transmission.js b/web/javascript/transmission.js
index 63a9c6f12..7974e1322 100644
--- a/web/javascript/transmission.js
+++ b/web/javascript/transmission.js
@@ -98,7 +98,6 @@ Transmission.prototype =
 		this._inspector._info_tab.size = $(ti+'size')[0];
 		this._inspector._info_tab.state = $(ti+'state')[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.upload_speed = $(ti+'upload_speed')[0];
 		this._inspector._info_tab.upload_to = $(ti+'upload_to')[0];
@@ -937,7 +936,6 @@ Transmission.prototype =
 		var total_size = 0;
 		var total_state = null;
 		var total_swarm_speed = 0;
-		var total_tracker = null;
 		var total_upload = 0;
 		var total_upload_peers = 0;
 		var total_upload_speed = 0;
@@ -951,7 +949,6 @@ Transmission.prototype =
 		{
 			setInnerHTML( tab.name, 'No Selection' );
 			setInnerHTML( tab.size, na );
-			setInnerHTML( tab.tracker, na );
 			setInnerHTML( tab.hash, na );
 			setInnerHTML( tab.state, na );
 			setInnerHTML( tab.download_speed, na );
@@ -1012,11 +1009,6 @@ Transmission.prototype =
 				total_state = t.stateStr();
 			else if ( total_state.search ( t.stateStr() ) == -1 )
 				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 )
 				have_private = true;
 			else
@@ -1030,7 +1022,6 @@ Transmission.prototype =
 
 		setInnerHTML( tab.name, name );
 		setInnerHTML( tab.size, torrents.length ? Math.formatBytes( total_size ) : na );
-		//setInnerHTML( tab.tracker, total_tracker.replace(/\//g, '/&#8203;') );
 		setInnerHTML( tab.hash, hash );
 		setInnerHTML( tab.state, total_state );
 		setInnerHTML( tab.download_speed, torrents.length ? Math.formatBytes( total_download_speed ) + '/s' : na );