(trunk web) part 2 of reverting the web client changes: adding Longinus00's filter-by-finished patch back in. I've learned my lesson -- no more hacking in clutch. http://github.com/charlesk/gearbox
This commit is contained in:
parent
d77abbea63
commit
d3f755957c
|
@ -213,6 +213,7 @@ Prefs._FilterActive = 'active';
|
|||
Prefs._FilterSeeding = 'seeding';
|
||||
Prefs._FilterDownloading = 'downloading';
|
||||
Prefs._FilterPaused = 'paused';
|
||||
Prefs._FilterFinished = 'finished';
|
||||
|
||||
Prefs._SortDirection = 'sort_direction';
|
||||
Prefs._SortAscending = 'ascending';
|
||||
|
|
|
@ -235,6 +235,7 @@ Torrent.prototype =
|
|||
|| this.state() == Torrent._StatusChecking; },
|
||||
isActive: function() { return this.state() != Torrent._StatusPaused; },
|
||||
isDownloading: function() { return this.state() == Torrent._StatusDownloading; },
|
||||
isFinished: function() { return this._isFinishedSeeding; },
|
||||
isSeeding: function() { return this.state() == Torrent._StatusSeeding; },
|
||||
name: function() { return this._name; },
|
||||
peersSendingToUs: function() { return this._peers_sending_to_us; },
|
||||
|
@ -254,7 +255,7 @@ Torrent.prototype =
|
|||
switch( this.state() ) {
|
||||
case Torrent._StatusSeeding: return 'Seeding';
|
||||
case Torrent._StatusDownloading: return 'Downloading';
|
||||
case Torrent._StatusPaused: return this._isFinishedSeeding ? 'Seeding complete' : 'Paused';
|
||||
case Torrent._StatusPaused: return this.isFinished() ? 'Seeding complete' : 'Paused';
|
||||
case Torrent._StatusChecking: return 'Verifying local data';
|
||||
case Torrent._StatusWaitingToCheck: return 'Waiting to verify';
|
||||
default: return 'error';
|
||||
|
@ -741,6 +742,9 @@ Torrent.prototype =
|
|||
case Prefs._FilterPaused:
|
||||
pass = !this.isActive();
|
||||
break;
|
||||
case Prefs._FilterFinished:
|
||||
pass = this.isFinished();
|
||||
break;
|
||||
default:
|
||||
pass = true;
|
||||
break;
|
||||
|
|
|
@ -45,6 +45,7 @@ Transmission.prototype =
|
|||
$('#filter_downloading_link').parent().bind('click', function(e){ tr.showDownloadingClicked(e); });
|
||||
$('#filter_seeding_link').parent().bind('click', function(e){ tr.showSeedingClicked(e); });
|
||||
$('#filter_paused_link').parent().bind('click', function(e){ tr.showPausedClicked(e); });
|
||||
$('#filter_finished_link').parent().bind('click', function(e){ tr.showFinishedClicked(e); });
|
||||
$('#prefs_save_button').bind('click', function(e) { tr.savePrefsClicked(e); return false;});
|
||||
$('#prefs_cancel_button').bind('click', function(e){ tr.cancelPrefsClicked(e); return false; });
|
||||
$('#stats_close_button').bind('click', function(e){ tr.closeStatsClicked(e); return false; });
|
||||
|
@ -780,6 +781,7 @@ Transmission.prototype =
|
|||
case Prefs._FilterSeeding: c = '#filter_seeding_link'; break;
|
||||
case Prefs._FilterDownloading: c = '#filter_downloading_link'; break;
|
||||
case Prefs._FilterPaused: c = '#filter_paused_link'; break;
|
||||
case Prefs._FilterFinished: c = '#filter_finished_link'; break;
|
||||
}
|
||||
$(c).parent().siblings().removeClass('selected');
|
||||
$(c).parent().addClass('selected');
|
||||
|
@ -803,6 +805,9 @@ Transmission.prototype =
|
|||
showPausedClicked: function(event) {
|
||||
this.setFilter( Prefs._FilterPaused );
|
||||
},
|
||||
showFinishedClicked: function(event) {
|
||||
this.setFilter( Prefs._FilterFinished );
|
||||
},
|
||||
|
||||
/*
|
||||
* 'Clutch Preferences' was clicked (iPhone only)
|
||||
|
@ -1392,7 +1397,7 @@ Transmission.prototype =
|
|||
html += '<td class="percentCol">' + Math.floor(peer.progress*100) + '%' + '</td>';
|
||||
html += '<td>' + peer.flagStr + '</td>';
|
||||
html += '<td>' + peer.address + '</td>';
|
||||
html += '<td>' + peer.clientName + '</td>';
|
||||
html += '<td class="clientCol">' + peer.clientName + '</td>';
|
||||
html += '</tr>';
|
||||
}
|
||||
html += '</table></div>';
|
||||
|
|
Loading…
Reference in New Issue