Changeset 7881

Timestamp:

Feb 12, 2009, 5:20:43 PM (13 years ago)

Author:

duncanbeevers

Message:

(trunk web) Add option to remove data when removing torrent from web interface

Location:

trunk/web

Files:

• index.html (modified) (2 diffs)
• javascript/menu.js (modified) (1 diff)
• javascript/transmission.js (modified) (7 diffs)
• javascript/transmission.remote.js (modified) (1 diff)
• stylesheets/common.css (modified) (1 diff)

trunk/web/index.html

@@ -31 +31 @@
                                  <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>
@@ -348 +349 @@
                                 <li id="context_resume_selected" class="disabled context_resume_selected">Resume Selected</li>
                                 <li id="context_remove">Remove From List...</li>
+                                <li id="context_removedata">Delete Data And Remove From List...</li>
                                 <li id="context_toggle_inspector">Show Inspector</li>
                                 <li class="separator"></li>

trunk/web/javascript/menu.js

@@ -12 +12 @@
                 
                 menu_style: {
-                        width: '210px',
+                        width: '310px',
                         backgroundColor: '#fff',
                         border: 'none',

trunk/web/javascript/transmission.js

@@ -47 +47 @@
                 $('#resume_selected_link').bind('click', this.startSelectedClicked);
                 $('#remove_link').bind('click',  this.removeClicked);
+                $('#removedata_link').bind('click',  this.removeDataClicked);
                 $('#filter_all_link').parent().bind('click', this.showAllClicked);
                 $('#filter_downloading_link').parent().bind('click', this.showDownloadingClicked);
@@ -198 +199 @@
                 transmission.removeSelectedTorrents( );
         },
+        contextRemoveDataSelected: function( ) {
+                transmission.removeSelectedTorrentsAndData( );
+        },
         contextToggleInspector: function( ) {
                 transmission.toggleInspector( );
@@ -217 +221 @@
                         context_resume_selected:   this.contextStartSelected,
                         context_remove:            this.contextRemoveSelected,
+                        context_removedata:        this.contextRemoveDataSelected,
                         context_toggle_inspector:  this.contextToggleInspector,
                         context_select_all:        this.contextSelectAll,
@@ -544 +549 @@
                 if( tr.isButtonEnabled( event ) ) {
                         tr.removeSelectedTorrents( );
+                        tr.hideiPhoneAddressbar( );
+                }
+        },
+
+        removeDataClicked: function( event ) {  
+                var tr = transmission;
+                if( tr.isButtonEnabled( event ) ) {
+                        tr.removeSelectedTorrentsAndData( );
                         tr.hideiPhoneAddressbar( );
                 }
@@ -1188 +1201 @@
         },
 
+        removeSelectedTorrentsAndData: function() {
+                var torrents = this.getSelectedTorrents( );
+                if( torrents.length )
+                        this.promptToRemoveTorrentsAndData( torrents );
+        },
+
         promptToRemoveTorrents:function( torrents )
         {
@@ -1205 +1224 @@
         },
 
+        promptToRemoveTorrentsAndData:function( torrents )
+        {
+                if( torrents.length == 1 )
+                {
+                        var torrent = torrents[0],
+                                header = 'Remove ' + torrent.name() + ' and delete data?',
+                                message = 'All data downloaded for this torrent will be deleted. Are you sure you want to remove it?';
+                        dialog.confirm( header, message, 'Remove', 'transmission.removeTorrentsAndData', torrents );
+                }
+                else 
+                {
+                        var header = 'Remove ' + torrents.length + ' transfers and delete data?',
+                                message = 'All data downloaded for these torrents will be deleted. Are you sure you want to remove them?';
+                        dialog.confirm( header, message, 'Remove', 'transmission.removeTorrentsAndData', torrents );
+                }
+        },
+
         removeTorrents: function( torrents ) {
                 this.remote.removeTorrents( torrents );
+        },
+
+        removeTorrentsAndData: function( torrents ) {
+                this.remote.removeTorrentsAndData( torrents );
         },
 
@@ -1337 +1377 @@
                         this.setEnabled( 'li.context_resume_selected', havePausedSelection );
                         this.setEnabled( 'li#remove', haveSelection );
+                        this.setEnabled( 'li#removedata', haveSelection );
                         this.setEnabled( 'li#pause_all', haveActive );
                         this.setEnabled( 'li#resume_all', havePaused );

trunk/web/javascript/transmission.remote.js

@@ -122 +122 @@
                 this.sendTorrentCommand( 'torrent-remove', torrents );
         },
+        removeTorrentsAndData: function( torrents ) {
+                var remote = this,
+                        o = { };
+                o.method = 'torrent-remove';
+                o.arguments = { };
+                o.arguments['delete-local-data'] = true;
+                o.arguments.ids = [ ];
+                if( torrents != null )
+                        for( var i=0, len=torrents.length; i<len; ++i )
+                                o.arguments.ids.push( torrents[i].id() );
+                this.sendRequest( RPC._Root, $.toJSON(o), function( ) {
+                        remote.loadTorrents();
+                }, "json" );
+        },
         addTorrentByUrl: function( url, options ) {
                 this.sendRequest( RPC._Root, $.toJSON({

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;
 }