From 89c5b691f5ccdb50917004fe86ab0a9dfb67e8cf Mon Sep 17 00:00:00 2001
From: Kevin Glowacz <kevin@glowacz.info>
Date: Tue, 7 Jul 2009 01:11:24 +0000
Subject: [PATCH] (trunk web) delete 'remove data' tool bar item for
 consistency. (Data is  still removable via the right click menu)

---
 web/index.html                 |  1 -
 web/javascript/transmission.js | 11 -----------
 web/stylesheets/common.css     |  8 --------
 web/stylesheets/iphone.css     |  6 +-----
 4 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/web/index.html b/web/index.html
index 3d406ad45..83cfc871f 100755
--- a/web/index.html
+++ b/web/index.html
@@ -35,7 +35,6 @@
 			 <ul>    
 				 <li id="open"><div id="open_link"><div class="toolbar_image"></div>Open</div></li>
 				 <li id="remove" class="disabled"><div id="remove_link"><div class="toolbar_image"></div>Remove</div></li>
-				 <li id="removedata" class="disabled"><div id="removedata_link"><div class="toolbar_image"></div>Remove Data</div></li>
 				 <li class="divider">&nbsp;</li>
 				 <li id="pause_selected" class="disabled"><div id="pause_selected_link"><div class="toolbar_image"></div>Pause</div></li>
 				 <li id="resume_selected" class="disabled"><div id="resume_selected_link"><div class="toolbar_image"></div>Resume</div></li>
diff --git a/web/javascript/transmission.js b/web/javascript/transmission.js
index 1b0372eab..3a6fbfba2 100644
--- a/web/javascript/transmission.js
+++ b/web/javascript/transmission.js
@@ -40,7 +40,6 @@ Transmission.prototype =
 		$('#pause_selected_link').bind('click', function(e){ tr.stopSelectedClicked(e); } );
 		$('#resume_selected_link').bind('click', function(e){ tr.startSelectedClicked(e); });
 		$('#remove_link').bind('click',  function(e){ tr.removeClicked(e); });
-		$('#removedata_link').bind('click',  function(e){ tr.removeDataClicked(e); });
 		$('#filter_all_link').parent().bind('click', function(e){ tr.showAllClicked(e); });
 		$('#filter_downloading_link').parent().bind('click', function(e){ tr.showDownloadingClicked(e); });
 		$('#filter_seeding_link').parent().bind('click', function(e){ tr.showSeedingClicked(e); });
@@ -76,7 +75,6 @@ Transmission.prototype =
 		this._toolbar_start_button     = $('li#resume_selected')[0];
 		this._toolbar_start_all_button = $('li#resume_all')[0];
 		this._toolbar_remove_button    = $('li#remove')[0];
-		this._toolbar_delete_button    = $('li#removedata')[0];
 		this._context_pause_button     = $('li#context_pause_selected')[0];
 		this._context_start_button     = $('li#context_resume_selected')[0];
 
@@ -613,14 +611,6 @@ Transmission.prototype =
 		}
 	},
 
-	removeDataClicked: function( event ) {	
-		var tr = this;
-		if( tr.isButtonEnabled( event ) ) {
-			tr.removeSelectedTorrentsAndData( );
-			tr.hideiPhoneAddressbar( );
-		}
-	},
-
 	toggleInspectorClicked: function( event ) {
 		var tr = this;
 		if( tr.isButtonEnabled( event ) )
@@ -1516,7 +1506,6 @@ Transmission.prototype =
 			this.setEnabled( this._toolbar_start_button, havePausedSelection );
 			this.setEnabled( this._context_start_button, havePausedSelection );
 			this.setEnabled( this._toolbar_remove_button, haveSelection );
-			this.setEnabled( this._toolbar_delete_button, haveSelection );
 			this.setEnabled( this._toolbar_pause_all_button, haveActive );
 			this.setEnabled( this._toolbar_start_all_button, havePaused );
 		}
diff --git a/web/stylesheets/common.css b/web/stylesheets/common.css
index 75fcfc18d..225780034 100644
--- a/web/stylesheets/common.css
+++ b/web/stylesheets/common.css
@@ -113,18 +113,10 @@ li#remove div div.toolbar_image, li#remove.disabled div:active div.toolbar_image
 	background-position: left -32px;
 }
 
-li#removedata div div.toolbar_image, li#removedata.disabled div:active div.toolbar_image {
-	background-position: left -32px;
-}
-
 li#remove div:active div.toolbar_image {
 	background-position: right -32px;
 }
 
-li#removedata div:active div.toolbar_image {
-	background-position: right -32px;
-}
-
 li#resume_selected div div.toolbar_image, li#resume_selected.disabled div:active div.toolbar_image {
 	background-position: left -96px;
 }
diff --git a/web/stylesheets/iphone.css b/web/stylesheets/iphone.css
index faab52a20..491133898 100644
--- a/web/stylesheets/iphone.css
+++ b/web/stylesheets/iphone.css
@@ -81,7 +81,7 @@ div.torrent_global_menu ul li {
 	display: inline-block;
 }
 
-li#remove, li#removedata {
+li#remove {
 	float: left;
 }
 
@@ -121,10 +121,6 @@ div.torrent_global_menu ul li#remove div div.toolbar_image {
 	background-position: left -32px;
 }
 
-div.torrent_global_menu ul li#removedata div div.toolbar_image {
-	background-position: left -32px;
-}
-
 div.torrent_global_menu ul li#resume_selected div div.toolbar_image {
 	background-position: left -96px;
 }