Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3847 from ysc3839/ttyd

Browse source 
luci-app-ttyd: use correct http protocol
This commit is contained in:
Jo-Philipp Wich 2020-04-05 20:53:55 +02:00 committed by GitHub
commit bdc86c8464
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
applications/luci-app-ttyd/htdocs/luci-static/resources/view/ttyd/term.js
View file

@ -7,12 +7,13 @@ return view.extend({
return uci.load('ttyd');
},
render: function() {
var port = uci.get_first('ttyd', 'ttyd', 'port') || '7681';
var port = uci.get_first('ttyd', 'ttyd', 'port') || '7681',
ssl = uci.get_first('ttyd', 'ttyd', 'ssl') || '0';
if (port === '0')
return E('div', { class: 'alert-message warning' },
_('Random ttyd port (port=0) is not supported.<br>Change to a fixed port and try again.'));
return E('iframe', {
src: window.location.protocol + '//' + window.location.hostname + ':' + port,
src: (ssl === '1' ? 'https' : 'http') + '://' + window.location.hostname + ':' + port,
style: 'width: 100%; min-height: 500px; border: none; border-radius: 3px; resize: vertical;'
});
},