update remote access selector for v2
Moe
parent
2a061b2264
commit
c2ebe1b5de
|
|
@ -2,6 +2,7 @@ $(document).ready(function(){
|
|||
var easyRemoteAccessTab = $('#easyRemoteAccess')
|
||||
var p2pHostSelectedContainer = $('#p2pHostSelected')
|
||||
var easyRemoteAccessForm = easyRemoteAccessTab.find('form')
|
||||
var remoteDashboardLinkButton = easyRemoteAccessTab.find('.remote-dashboard-link')
|
||||
var loadingRegistration = false
|
||||
var currentlyRegisteredP2PServer = currentlySelectedP2PServerId ? currentlySelectedP2PServerId + '' : undefined
|
||||
function copyToClipboard(str) {
|
||||
|
|
@ -35,12 +36,13 @@ $(document).ready(function(){
|
|||
var chartViewerCount = cardEl.find('.chartViewerCount')
|
||||
var connectedUsers = cardEl.find('.connectedUsers')
|
||||
var registeredServers = cardEl.find('.registeredServers')
|
||||
var chartPort = server.v2 ? server.chartPort || server.webPort + 2 : server.p2pPort
|
||||
var chartPort = server.v2 ? server.chartPort || parseInt(server.webPort) + 2 : server.p2pPort
|
||||
var socketConnection = io(`ws://${server.host}:${chartPort}`,{
|
||||
transports: ['websocket'],
|
||||
query: {
|
||||
charts: '1'
|
||||
}
|
||||
},
|
||||
reconnect: false,
|
||||
})
|
||||
socketConnection.on('initUI',function(data){
|
||||
cardEl.find('.ramTotal').text(bytesToSize(data.ram))
|
||||
|
|
@ -75,6 +77,22 @@ $(document).ready(function(){
|
|||
var cardEl = easyRemoteAccessTab.find(`[drawn-id="${key}"]`)
|
||||
easyRemoteAccessTab.find(`[drawn-id].selected`).removeClass('selected')
|
||||
cardEl.addClass('selected')
|
||||
setCurrentRemoteLink()
|
||||
}
|
||||
}
|
||||
function setCurrentRemoteLink(){
|
||||
var apiKey = easyRemoteAccessForm.find('[name="p2pApiKey"]').val()
|
||||
var selectedServer = p2pServerList[currentlyRegisteredP2PServer]
|
||||
console.log(selectedServer,currentlySelectedP2PServerId,p2pServerList)
|
||||
if(selectedServer && selectedServer.host){
|
||||
var href = `http://${selectedServer.host}:${selectedServer.webPort}/s/${apiKey}/${window.useBetterP2P ? '' : '?p2p=1'}`
|
||||
remoteDashboardLinkButton.attr('href',href)
|
||||
}else{
|
||||
new PNotify({
|
||||
type: 'warning',
|
||||
title: lang['P2P Server Not Selected'],
|
||||
text: lang.p2pServerNotSelectedText,
|
||||
})
|
||||
}
|
||||
}
|
||||
easyRemoteAccessTab.find('.submit').click(function(){
|
||||
|
|
@ -97,6 +115,7 @@ $(document).ready(function(){
|
|||
title: lang['P2P Settings Applied'],
|
||||
text: lang.p2pSettingsText1,
|
||||
})
|
||||
setCurrentRemoteLink()
|
||||
setTimeout(enableForm,5000)
|
||||
}
|
||||
})
|
||||
|
|
@ -109,26 +128,6 @@ $(document).ready(function(){
|
|||
el.addClass('active')
|
||||
currentlySelectedP2PServerId = p2pServerId
|
||||
})
|
||||
easyRemoteAccessTab.on('click','.remote-dashboard-link',function(e){
|
||||
e.preventDefault()
|
||||
if(!loadingRegistration){
|
||||
var apiKey = easyRemoteAccessForm.find('[name="p2pApiKey"]').val()
|
||||
var selectedServer = p2pServerList[currentlyRegisteredP2PServer]
|
||||
console.log(selectedServer,currentlySelectedP2PServerId,p2pServerList)
|
||||
if(selectedServer && selectedServer.host){
|
||||
var href = `http://${selectedServer.host}:${selectedServer.webPort}/s/${apiKey}/?p2p=1`
|
||||
var win = window.open(href, '_blank');
|
||||
win.focus();
|
||||
}else{
|
||||
new PNotify({
|
||||
type: 'warning',
|
||||
title: lang['P2P Server Not Selected'],
|
||||
text: lang.p2pServerNotSelectedText,
|
||||
})
|
||||
}
|
||||
}
|
||||
return false;
|
||||
})
|
||||
easyRemoteAccessTab.on('click','.remote-dashboard-link-copy',function(e){
|
||||
e.preventDefault()
|
||||
if(!loadingRegistration){
|
||||
|
|
@ -136,7 +135,7 @@ $(document).ready(function(){
|
|||
var selectedServer = p2pServerList[currentlyRegisteredP2PServer]
|
||||
console.log(selectedServer,currentlySelectedP2PServerId,p2pServerList)
|
||||
if(selectedServer && selectedServer.host){
|
||||
var href = `http://${selectedServer.host}:${selectedServer.webPort}/s/${apiKey}?p2p=1`
|
||||
var href = `http://${selectedServer.host}:${selectedServer.webPort}/s/${apiKey}/${window.useBetterP2P ? '' : '?p2p=1'}`
|
||||
copyToClipboard(href)
|
||||
new PNotify({
|
||||
type: 'success',
|
||||
|
|
@ -155,7 +154,7 @@ $(document).ready(function(){
|
|||
})
|
||||
$.each(p2pServerList,function(key,server){
|
||||
server.key = key
|
||||
if(useBetterP2P && !server.v2)return;
|
||||
if(window.useBetterP2P && !server.v2)return;
|
||||
beginStatusConnectionForServer(key,server)
|
||||
})
|
||||
displayCurrentlySelectedInternally()
|
||||
|
|
|
|||
|
|
@ -30,23 +30,19 @@
|
|||
<a style="flex:12" href="#" class="submit btn btn-success"><i class="fa fa-check"></i> <%- lang.Save %></a>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>
|
||||
<div><span><%-lang['Enabled']%></span></div>
|
||||
<div><select class="form-control" type="email" name="p2pEnabled">
|
||||
<option <% if(config.p2pEnabled === true){ %>selected<% } %> value="1">Yes</option>
|
||||
<option <% if(config.p2pEnabled !== true){ %>selected<% } %> value="0">No</option>
|
||||
</select></div>
|
||||
</label>
|
||||
<span><%-lang['Enabled']%></span>
|
||||
<select class="form-control" type="email" name="p2pEnabled">
|
||||
<option <% if(config.p2pEnabled === true){ %>selected<% } %> value="1">Yes</option>
|
||||
<option <% if(config.p2pEnabled !== true){ %>selected<% } %> value="0">No</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>
|
||||
<div><span><%-lang['P2P API Key']%></span></div>
|
||||
<div><input class="form-control" type="text" name="p2pApiKey" value="<%- config.p2pApiKey %>"></div>
|
||||
</label>
|
||||
<span><%-lang['P2P API Key']%></span>
|
||||
<input class="form-control" type="text" name="p2pApiKey" value="<%- config.p2pApiKey %>">
|
||||
</div>
|
||||
<div class="form-group btn-group" style="display:flex">
|
||||
<a style="flex:6" target="_blank" href="#" class="btn btn-default remote-dashboard-link-copy"><i class="fa fa-copy"></i> <%- lang['Copy Remote Link'] %></a>
|
||||
<a style="flex:6" target="_blank" href="#" class="btn btn-info remote-dashboard-link"><i class="fa fa-external-link"></i> <%- lang['Open Remote Dashboard'] %></a>
|
||||
<a style="flex:6" target="_blank" href="#" class="btn btn-info remote-dashboard-link" target="_blank"><i class="fa fa-external-link"></i> <%- lang['Open Remote Dashboard'] %></a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6 pt-2 pb-4">
|
||||
|
|
|
|||
Loading…
Reference in New Issue