jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't erase failed state error messages on disconnect.

This commit is contained in:
Joel Martin 2010-04-19 10:46:48 -05:00
parent 0166284a64
commit 7b99f70bd0
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vnc.html
View File

@ -27,6 +27,7 @@
onblur="RFB.clipboardFocus=false;"></textarea> onblur="RFB.clipboardFocus=false;"></textarea>
</body> </body>
<!-- Uncomment to activate firebug lite -->
<!-- <!--
<script type='text/javascript' <script type='text/javascript'
src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script> src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script>

8
vnc.js
View File

@ -941,8 +941,12 @@ init_ws: function () {
console.log(">> WebSocket.onclose"); console.log(">> WebSocket.onclose");
clearInterval(RFB.sendID); clearInterval(RFB.sendID);
if (RFB.state != 'disconnected') { if (RFB.state != 'disconnected') {
if (RFB.state == 'failed') {
RFB.updateState('disconnected');
} else {
RFB.updateState('disconnected', 'VNC disconnected'); RFB.updateState('disconnected', 'VNC disconnected');
} }
}
console.log("<< WebSocket.onclose"); console.log("<< WebSocket.onclose");
}; };
RFB.ws.onerror = function(e) { RFB.ws.onerror = function(e) {
@ -1005,7 +1009,11 @@ disconnect: function () {
} }
} }
if (RFB.state == 'failed') {
RFB.updateState('disconnected');
} else {
RFB.updateState('disconnected', 'Disconnected'); RFB.updateState('disconnected', 'Disconnected');
}
console.log("<< disconnect"); console.log("<< disconnect");
} }