mirror of
https://github.com/transmission/transmission.git
synced 2025-12-24 04:18:39 +00:00
(trunk) #3045 "make libtransmission's API byte-oriented instead of KiB-oriented." -- implemented. This is a largish commit and will break the mac build for a little while.
This commit is contained in:
@@ -640,20 +640,26 @@ Transmission.prototype =
|
||||
tr.togglePeriodicRefresh( true );
|
||||
}
|
||||
|
||||
var speed_K = Transmission.fmt.speed_K;
|
||||
var up_bytes = parseInt( $('#prefs_form #upload_rate' )[0].value ) * speed_K;
|
||||
var dn_bytes = parseInt( $('#prefs_form #download_rate')[0].value ) * speed_K;
|
||||
var turtle_up_bytes = parseInt( $('#prefs_form #turtle_upload_rate' )[0].value ) * speed_K;
|
||||
var turtle_dn_bytes = parseInt( $('#prefs_form #turtle_download_rate')[0].value ) * speed_K;
|
||||
|
||||
// pass the new prefs upstream to the RPC server
|
||||
var o = { };
|
||||
o[RPC._StartAddedTorrent] = $('#prefs_form #auto_start')[0].checked;
|
||||
o[RPC._PeerPort] = parseInt( $('#prefs_form #port')[0].value );
|
||||
o[RPC._UpSpeedLimit] = parseInt( $('#prefs_form #upload_rate')[0].value );
|
||||
o[RPC._DownSpeedLimit] = parseInt( $('#prefs_form #download_rate')[0].value );
|
||||
o[RPC._UpSpeedLimit] = up_bytes;
|
||||
o[RPC._DownSpeedLimit] = dn_bytes;
|
||||
o[RPC._DownloadDir] = $('#prefs_form #download_location')[0].value;
|
||||
o[RPC._UpSpeedLimited] = $('#prefs_form #limit_upload')[0].checked;
|
||||
o[RPC._UpSpeedLimited] = $('#prefs_form #limit_upload' )[0].checked;
|
||||
o[RPC._DownSpeedLimited] = $('#prefs_form #limit_download')[0].checked;
|
||||
o[RPC._Encryption] = $('#prefs_form #encryption')[0].checked
|
||||
? RPC._EncryptionRequired
|
||||
: RPC._EncryptionPreferred;
|
||||
o[RPC._TurtleDownSpeedLimit] = parseInt( $('#prefs_form #turtle_download_rate')[0].value );
|
||||
o[RPC._TurtleUpSpeedLimit] = parseInt( $('#prefs_form #turtle_upload_rate')[0].value );
|
||||
o[RPC._TurtleDownSpeedLimit] = turtle_dn_bytes;
|
||||
o[RPC._TurtleUpSpeedLimit] = turtle_up_bytes;
|
||||
o[RPC._TurtleTimeEnabled] = $('#prefs_form #turtle_schedule')[0].checked;
|
||||
o[RPC._TurtleTimeBegin] = parseInt( $('#prefs_form #turtle_start_time').val() );
|
||||
o[RPC._TurtleTimeEnd] = parseInt( $('#prefs_form #turtle_end_time').val() );
|
||||
@@ -926,22 +932,26 @@ Transmission.prototype =
|
||||
// remember them for later
|
||||
this._prefs = prefs;
|
||||
|
||||
var down_limit = prefs[RPC._DownSpeedLimit];
|
||||
var down_limited = prefs[RPC._DownSpeedLimited];
|
||||
var up_limit = prefs[RPC._UpSpeedLimit];
|
||||
var up_limited = prefs[RPC._UpSpeedLimited];
|
||||
var up_limited = prefs[RPC._UpSpeedLimited];
|
||||
var dn_limited = prefs[RPC._DownSpeedLimited];
|
||||
var up_limit_b = prefs[RPC._UpSpeedLimit];
|
||||
var dn_limit_b = prefs[RPC._DownSpeedLimit];
|
||||
var up_limit_k = up_limit_b / Transmission.fmt.speed_K;
|
||||
var dn_limit_k = dn_limit_b / Transmission.fmt.speed_K;
|
||||
var turtle_up_limit_k = prefs[RPC._TurtleUpSpeedLimit] / Transmission.fmt.speed_K;
|
||||
var turtle_dn_limit_k = prefs[RPC._TurtleDownSpeedLimit] / Transmission.fmt.speed_K;
|
||||
|
||||
$('div.download_location input')[0].value = prefs[RPC._DownloadDir];
|
||||
$('div.port input')[0].value = prefs[RPC._PeerPort];
|
||||
$('div.auto_start input')[0].checked = prefs[RPC._StartAddedTorrent];
|
||||
$('input#limit_download')[0].checked = down_limited;
|
||||
$('input#download_rate')[0].value = down_limit;
|
||||
$('input#limit_download')[0].checked = dn_limited;
|
||||
$('input#download_rate')[0].value = dn_limit_k;
|
||||
$('input#limit_upload')[0].checked = up_limited;
|
||||
$('input#upload_rate')[0].value = up_limit;
|
||||
$('input#upload_rate')[0].value = up_limit_k;
|
||||
$('input#refresh_rate')[0].value = prefs[Prefs._RefreshRate];
|
||||
$('div.encryption input')[0].checked = prefs[RPC._Encryption] == RPC._EncryptionRequired;
|
||||
$('input#turtle_download_rate')[0].value = prefs[RPC._TurtleDownSpeedLimit];
|
||||
$('input#turtle_upload_rate')[0].value = prefs[RPC._TurtleUpSpeedLimit];
|
||||
$('input#turtle_download_rate')[0].value = turtle_dn_limit_k;
|
||||
$('input#turtle_upload_rate')[0].value = turtle_up_limit_k;
|
||||
$('input#turtle_schedule')[0].checked = prefs[RPC._TurtleTimeEnabled];
|
||||
$('select#turtle_start_time').val( prefs[RPC._TurtleTimeBegin] );
|
||||
$('select#turtle_end_time').val( prefs[RPC._TurtleTimeEnd] );
|
||||
@@ -950,12 +960,12 @@ Transmission.prototype =
|
||||
|
||||
if (!iPhone)
|
||||
{
|
||||
setInnerHTML( $('#limited_download_rate')[0], 'Limit (' + Transmission.fmt.speed(down_limit) + ')' );
|
||||
var key = down_limited ? '#limited_download_rate'
|
||||
setInnerHTML( $('#limited_download_rate')[0], 'Limit (' + Transmission.fmt.speed(dn_limit_b) + ')' );
|
||||
var key = dn_limited ? '#limited_download_rate'
|
||||
: '#unlimited_download_rate';
|
||||
$(key).deselectMenuSiblings().selectMenuItem();
|
||||
|
||||
setInnerHTML( $('#limited_download_rate')[0], 'Limit (' + Transmission.fmt.speed(up_limit) + ')' );
|
||||
setInnerHTML( $('#limited_upload_rate')[0], 'Limit (' + Transmission.fmt.speed(up_limit_b) + ')' );
|
||||
key = up_limited ? '#limited_upload_rate'
|
||||
: '#unlimited_upload_rate';
|
||||
$(key).deselectMenuSiblings().selectMenuItem();
|
||||
@@ -1064,15 +1074,16 @@ Transmission.prototype =
|
||||
// Limit the download rate
|
||||
case 'footer_download_rate_menu':
|
||||
var args = { };
|
||||
var rate = ($element[0].innerHTML).replace(/[^0-9]/ig, '');
|
||||
if ($element.is('#unlimited_download_rate')) {
|
||||
$element.deselectMenuSiblings().selectMenuItem();
|
||||
args[RPC._DownSpeedLimited] = false;
|
||||
} else {
|
||||
setInnerHTML( $('#limited_download_rate')[0], 'Limit (' + Transmission.fmt.speed(rate) + ')' );
|
||||
var rate_str = ($element[0].innerHTML).replace(/[^0-9]/ig, '');
|
||||
var rate_b = parseInt( rate_str ) * Transmission.fmt.speed_K;
|
||||
setInnerHTML( $('#limited_download_rate')[0], 'Limit (' + Transmission.fmt.speed(rate_b) + ')' );
|
||||
$('#limited_download_rate').deselectMenuSiblings().selectMenuItem();
|
||||
$('div.preference input#download_rate')[0].value = rate;
|
||||
args[RPC._DownSpeedLimit] = parseInt( rate );
|
||||
$('div.preference input#download_rate')[0].value = rate_str;
|
||||
args[RPC._DownSpeedLimit] = rate_b;
|
||||
args[RPC._DownSpeedLimited] = true;
|
||||
}
|
||||
$('div.preference input#limit_download')[0].checked = args[RPC._DownSpeedLimited];
|
||||
@@ -1082,15 +1093,16 @@ Transmission.prototype =
|
||||
// Limit the upload rate
|
||||
case 'footer_upload_rate_menu':
|
||||
var args = { };
|
||||
var rate = ($element[0].innerHTML).replace(/[^0-9]/ig, '');
|
||||
if ($element.is('#unlimited_upload_rate')) {
|
||||
$element.deselectMenuSiblings().selectMenuItem();
|
||||
args[RPC._UpSpeedLimited] = false;
|
||||
} else {
|
||||
setInnerHTML( $('#limited_upload_rate')[0], 'Limit (' + Transmission.fmt.speed(rate) + ')' );
|
||||
var rate_str = ($element[0].innerHTML).replace(/[^0-9]/ig, '');
|
||||
var rate_b = parseInt( rate_str ) * Transmission.fmt.speed_K;
|
||||
setInnerHTML( $('#limited_upload_rate')[0], 'Limit (' + Transmission.fmt.speed(rate_b) + ')' );
|
||||
$('#limited_upload_rate').deselectMenuSiblings().selectMenuItem();
|
||||
$('div.preference input#upload_rate')[0].value = rate;
|
||||
args[RPC._UpSpeedLimit] = parseInt( rate );
|
||||
$('div.preference input#upload_rate')[0].value = rate_str;
|
||||
args[RPC._UpSpeedLimit] = rate_b;
|
||||
args[RPC._UpSpeedLimited] = true;
|
||||
}
|
||||
$('div.preference input#limit_upload')[0].checked = args[RPC._UpSpeedLimited];
|
||||
|
||||
Reference in New Issue
Block a user