upstream/transmission-web-control
1
0
Fork 0
mirror of https://github.com/ronggang/transmission-web-control.git synced 2024-09-20 06:45:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix port test

Browse Source 
- fix https://github.com/ronggang/transmission-web-control/issues/518#issue-787749913
https://github.com/ronggang/transmission-web-control/blob/master/src/tr-web-control/template/dialog-system-config.html#L741L743 should move outside the first if, in rare conditions, data.result returns error message.
- fix change port then test will change port to 1
This commit is contained in:
imebeh 2021-01-18 03:39:43 +08:00
parent 8e3222c413
commit ca35a466c3
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/tr-web-control/template/dialog-system-config.html
View File

@ -698,34 +698,44 @@
// 测试端口
thisDialog.find('#system-config-test-port').click(function () {
var button = $(this);
button.linkbutton({
text: system.lang.dialog['system-config'].testing,
disabled: true
});
var newPort = parseInt(thisDialog.find('#peer-port').val());
function buttonPortTestStatus(enabled) {
button.linkbutton({
text: system.lang.dialog['system-config'][enabled?'test-port':'testing'],
disabled: !enabled
});
}
function labelPortOpenStatus(opened) {
if (opened) {
thisDialog.find('#system-config-port-is-open-true').fadeInAndOut();
} else {
thisDialog.find('#system-config-port-is-open-false').fadeInAndOut();
}
}
buttonPortTestStatus(false);
// 如果端口有变更，则先保存
if (parseInt(thisDialog.find('#peer-port').val()) != system.serverConfig['peer-port']) {
if (newPort != system.serverConfig['peer-port']) {
transmission.exec({
method: 'session-set',
arguments: {
'peer-port': true
'peer-port': newPort
}
}, function (data) {
if (data.result == 'success') {
system.serverConfig['peer-port'] = newPort;
transmission.exec({
method: 'port-test'
}, function (data) {
if (data.result == 'success') {
if (data.arguments['port-is-open']) {
thisDialog.find('#system-config-port-is-open-true').fadeInAndOut();
} else {
thisDialog.find('#system-config-port-is-open-false').fadeInAndOut();
}
labelPortOpenStatus(data.arguments['port-is-open']==true);
}
button.linkbutton({
text: system.lang.dialog['system-config']['test-port'],
disabled: false
});
buttonPortTestStatus(true);
});
} else {
buttonPortTestStatus(true);
}
});
} else {
@ -733,16 +743,9 @@
method: 'port-test'
}, function (data) {
if (data.result == 'success') {
if (data.arguments['port-is-open']) {
thisDialog.find('#system-config-port-is-open-true').fadeInAndOut();
} else {
thisDialog.find('#system-config-port-is-open-false').fadeInAndOut();
}
button.linkbutton({
text: system.lang.dialog['system-config']['test-port'],
disabled: false
});
labelPortOpenStatus(data.arguments['port-is-open']==true);
}
buttonPortTestStatus(true);
});
}
});