Changeset 8787

Timestamp:

Jul 7, 2009, 1:11:24 AM (13 years ago)

Author:

kjg

Message:

(trunk web) delete 'remove data' tool bar item for consistency. (Data is still removable via the right click menu)

Location:

trunk/web

Files:

• index.html (modified) (1 diff)
• javascript/transmission.js (modified) (4 diffs)
• stylesheets/common.css (modified) (1 diff)
• stylesheets/iphone.css (modified) (2 diffs)

trunk/web/index.html

@@ -36 +36 @@
                                  <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>

trunk/web/javascript/transmission.js

@@ -41 +41 @@
                 $('#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); });
@@ -77 +76 @@
                 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];
@@ -610 +608 @@
                 if( tr.isButtonEnabled( event ) ) {
                         tr.removeSelectedTorrents( );
-                        tr.hideiPhoneAddressbar( );
-                }
-        },
-
-        removeDataClicked: function( event ) {  
-                var tr = this;
-                if( tr.isButtonEnabled( event ) ) {
-                        tr.removeSelectedTorrentsAndData( );
                         tr.hideiPhoneAddressbar( );
                 }
@@ -1517 +1507 @@
                         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 );

trunk/web/stylesheets/common.css

@@ -114 +114 @@
 }
 
-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;
 }

trunk/web/stylesheets/iphone.css

@@ -82 +82 @@
 }
 
-li#remove, li#removedata {
+li#remove {
         float: left;
 }
@@ -119 +119 @@
 
 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;
 }