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

Merge pull request #391 from mandre/fix_invalid_property 

Fix invalid updateState property on RFB preventing noVNC to load
This commit is contained in:
Solly 2014-09-19 12:35:27 -04:00
parent 2c9623b5a7 77bd04f833
commit e4e9a9b97f
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/util.js
View File

@ -341,6 +341,10 @@ Util.set_defaults = function (obj, conf, defaults) {
for (i = 0; i < keys.length; i++) { for (i = 0; i < keys.length; i++) {
var setter = obj['_raw_set_' + keys[i]]; var setter = obj['_raw_set_' + keys[i]];
if (!setter) {
Util.Warn('Invalid property ' + keys[i]);
continue;
}
if (conf[keys[i]]) { if (conf[keys[i]]) {
setter.call(obj, conf[keys[i]]); setter.call(obj, conf[keys[i]]);

2
tests/vnc_perf.html
View File

@ -202,7 +202,7 @@
dbgmsg(" " + enc + ": " + VNC_frame_data_multi[enc].length); dbgmsg(" " + enc + ": " + VNC_frame_data_multi[enc].length);
} }
rfb = new RFB({'target': $D('VNC_canvas'), rfb = new RFB({'target': $D('VNC_canvas'),
'updateState': updateState}); 'onUpdateState': updateState});
rfb.testMode(send_array, VNC_frame_encoding); rfb.testMode(send_array, VNC_frame_encoding);
} }
</script> </script>

2
tests/vnc_playback.html
View File

@ -131,7 +131,7 @@
if (fname) { if (fname) {
message("VNC_frame_data.length: " + VNC_frame_data.length); message("VNC_frame_data.length: " + VNC_frame_data.length);
rfb = new RFB({'target': $D('VNC_canvas'), rfb = new RFB({'target': $D('VNC_canvas'),
'updateState': updateState}); 'onUpdateState': updateState});
} }
} }
</script> </script>

2
vnc_auto.html
View File

@ -198,7 +198,7 @@
'local_cursor': WebUtil.getQueryVar('cursor', true), 'local_cursor': WebUtil.getQueryVar('cursor', true),
'shared': WebUtil.getQueryVar('shared', true), 'shared': WebUtil.getQueryVar('shared', true),
'view_only': WebUtil.getQueryVar('view_only', false), 'view_only': WebUtil.getQueryVar('view_only', false),
'updateState': updateState, 'onUpdateState': updateState,
'onXvpInit': xvpInit, 'onXvpInit': xvpInit,
'onPasswordRequired': passwordRequired}); 'onPasswordRequired': passwordRequired});
rfb.connect(host, port, password, path); rfb.connect(host, port, password, path);