j3d1/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2024-12-24 15:15:22 +00:00
Code Issues Projects Releases Wiki Activity

twice calling function generates two vnc console. ES6 requirement no longer necessary. it is disabled and problem solved.

Browse source
This commit is contained in:
catborise 2018-08-28 15:55:11 +03:00
parent e9e2185fb4
commit 14e145e0d8
1 changed files with 22 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
console/templates/console-vnc-lite.html
View file

@ -1,6 +1,7 @@
{% extends "console-base.html" %} {% extends "console-base.html" %}
{% load i18n %} {% load i18n %}
{% load staticfiles %} {% load staticfiles %}
{% block head %} {% block head %}
<!-- <!--
noVNC example: lightweight example using minimal UI and features noVNC example: lightweight example using minimal UI and features
@ -14,7 +15,7 @@
or the fragment: or the fragment:
http://example.com/#host=HOST&port=PORT&encrypt=1 http://example.com/#host=HOST&port=PORT&encrypt=1
--> -->
<title>noVNC</title> <title>WebVirtCloud - noVNC - Lite</title>
<meta charset="utf-8"> <meta charset="utf-8">
@ -63,7 +64,7 @@
<!-- promise polyfills promises for IE11 --> <!-- promise polyfills promises for IE11 -->
<script src="{% static "js/novnc/vendor/promise.js" %}"></script> <script src="{% static "js/novnc/vendor/promise.js" %}"></script>
<!-- ES2015/ES6 modules polyfill --> <!-- ES2015/ES6 modules polyfill -->
<script type="module"> window._noVNC_has_module_support = false;</script> <script type="module"> window._noVNC_has_module_support = true;</script>
<script> <script>
window.addEventListener("load", function() { window.addEventListener("load", function() {
if (window._noVNC_has_module_support) return; if (window._noVNC_has_module_support) return;
@ -72,27 +73,8 @@
document.head.appendChild(loader); document.head.appendChild(loader);
}); });
</script> </script>
{% endblock %}
<!-- actual script modules -->
{% block content %}
<div id="noVNC_status_bar">
<div id="noVNC_left_dummy_elem"></div>
<div id="noVNC_status">Loading</div>
<div id="noVNC_buttons">
<input type=button value="Send CtrlAltDel" id="sendCtrlAltDelButton" class="noVNC_shown">
<span id="noVNC_power_buttons" class="noVNC_hidden">
<input type=button value="Shutdown" id="machineShutdownButton">
<input type=button value="Reboot" id="machineRebootButton">
<input type=button value="Reset" id="machineResetButton">
</span>
</div>
</div>
<div id='vnc_container'></div>
<!-- actual script modules -->
<script type="module" crossorigin="anonymous"> <script type="module" crossorigin="anonymous">
// Load supporting scripts // Load supporting scripts
import * as WebUtil from '{% static "js/novnc/app/webutil.js" %}'; import * as WebUtil from '{% static "js/novnc/app/webutil.js" %}';
@ -122,7 +104,6 @@
rfb.sendCredentials({ password: document.getElementById('password_input').value }); rfb.sendCredentials({ password: document.getElementById('password_input').value });
return false; return false;
} }
function fullscreen() { function fullscreen() {
if (document.fullscreenElement || // alternative standard method if (document.fullscreenElement || // alternative standard method
document.mozFullScreenElement || // currently working methods document.mozFullScreenElement || // currently working methods
@ -150,7 +131,6 @@
} }
return false; return false;
} }
function sendCtrlAltFN(f) { function sendCtrlAltFN(f) {
rfb.sendCtrlAltFN(f); rfb.sendCtrlAltFN(f);
return false; return false;
@ -293,7 +273,7 @@
// { repeaterID: WebUtil.getConfigVar('repeaterID', ''), // { repeaterID: WebUtil.getConfigVar('repeaterID', ''),
// shared: WebUtil.getConfigVar('shared', true), // shared: WebUtil.getConfigVar('shared', true),
// credentials: { password: password } }); // credentials: { password: password } });
rfb = new RFB(document.getElementById('vnc_container'), url, rfb = new RFB(document.getElementById('noVNC_container'), url,
{ repeaterID: WebUtil.getConfigVar('repeaterID', ''), { repeaterID: WebUtil.getConfigVar('repeaterID', ''),
shared: WebUtil.getConfigVar('shared', true), shared: WebUtil.getConfigVar('shared', true),
credentials: { password: password } }); credentials: { password: password } });
@ -308,6 +288,21 @@
rfb.resizeSession = WebUtil.getConfigVar('resize', false); rfb.resizeSession = WebUtil.getConfigVar('resize', false);
})(); })();
</script> </script>
{% endblock %}
{% block content %}
<div id="noVNC_status_bar">
<div id="noVNC_left_dummy_elem"></div>
<div id="noVNC_status">Loading</div>
<div id="noVNC_buttons">
<input type=button value="Send CtrlAltDel" id="sendCtrlAltDelButton" class="noVNC_shown">
<span id="noVNC_power_buttons" class="noVNC_hidden">
<input type=button value="Shutdown" id="machineShutdownButton">
<input type=button value="Reboot" id="machineRebootButton">
<input type=button value="Reset" id="machineResetButton">
</span>
</div>
</div>
<div id='noVNC_container'></div>
{% endblock %} {% endblock %}