Commit 351a1da3 authored by Joel Martin's avatar Joel Martin

Init updated web-socket-js correctly. TODO updates.

parent ae0ecca2
Short Term: Short Term:
- Timing delta between frames in proxy record log, for playback
support (for demo and test).
- Playback/demo on website.
- Test on IE 9 preview 3. - Test on IE 9 preview 3.
- Possibly support IE <= 8.0 using excanvas or fxcanvas: - Possibly support IE <= 8.0 using excanvas or fxcanvas:
http://excanvas.sourceforge.net/ http://excanvas.sourceforge.net/
http://code.google.com/p/fxcanvas/ http://code.google.com/p/fxcanvas/
- Timing delta between frames in proxy record log, for playback
support (for demo and test).
Medium Term: Medium Term:
......
...@@ -40,6 +40,8 @@ function get_VNC_uri_prefix() { ...@@ -40,6 +40,8 @@ function get_VNC_uri_prefix() {
VNC_native_ws = true; VNC_native_ws = true;
} else { } else {
VNC_native_ws = false; VNC_native_ws = false;
WebSocket__swfLocation = get_VNC_uri_prefix() +
"web-socket-js/WebSocketMain.swf";
extra += start + "web-socket-js/swfobject.js" + end; extra += start + "web-socket-js/swfobject.js" + end;
extra += start + "web-socket-js/FABridge.js" + end; extra += start + "web-socket-js/FABridge.js" + end;
extra += start + "web-socket-js/web_socket.js" + end; extra += start + "web-socket-js/web_socket.js" + end;
...@@ -132,9 +134,6 @@ load: function () { ...@@ -132,9 +134,6 @@ load: function () {
RFB.updateState('failed', RFB.updateState('failed',
"'file://' URL is incompatible with Adobe Flash"); "'file://' URL is incompatible with Adobe Flash");
} else { } else {
WebSocket.__swfLocation = get_VNC_uri_prefix() +
"web-socket-js/WebSocketMain.swf";
WebSocket.__initialize();
RFB.updateState('disconnected', 'Disconnected'); RFB.updateState('disconnected', 'Disconnected');
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment