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

Revert "TESTING, TO BE REMOVED" 

This reverts commit e894bf7f11.
This commit is contained in:
samhed 2015-01-22 10:02:44 +01:00
parent e894bf7f11
commit 6f4310e7b1
3 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/display.js
View File

@ -396,7 +396,6 @@ that.absY = function(y) {
that.resize = function(width, height) { that.resize = function(width, height) {
console.log("resize");
c_prevStyle = ""; c_prevStyle = "";
fb_width = width; fb_width = width;
@ -404,7 +403,6 @@ that.resize = function(width, height) {
rescale(conf.scale); rescale(conf.scale);
that.viewportChange(0, 0, width, height); that.viewportChange(0, 0, width, height);
//that.viewportChange();
}; };
that.clear = function() { that.clear = function() {

6
include/rfb.js
View File

@ -64,8 +64,8 @@ var that = {}, // Public API methods
//['JPEG_quality_hi', -23 ], //['JPEG_quality_hi', -23 ],
//['compress_lo', -255 ], //['compress_lo', -255 ],
['compress_hi', -247 ], ['compress_hi', -247 ],
['last_rect', -224 ] ['last_rect', -224 ],
//['ext_desktop_size', -308 ] ['ext_desktop_size', -308 ]
], ],
encHandlers = {}, encHandlers = {},
@ -1627,7 +1627,6 @@ encHandlers.ext_desktop_size = function () {
fb_width = FBU.width; fb_width = FBU.width;
fb_height = FBU.height; fb_height = FBU.height;
conf.onFBResize(that, fb_width, fb_height); conf.onFBResize(that, fb_width, fb_height);
console.log("extended");
display.resize(fb_width, fb_height); display.resize(fb_width, fb_height);
FBU.bytes = 0; FBU.bytes = 0;
@ -1641,7 +1640,6 @@ encHandlers.DesktopSize = function set_desktopsize() {
fb_width = FBU.width; fb_width = FBU.width;
fb_height = FBU.height; fb_height = FBU.height;
conf.onFBResize(that, fb_width, fb_height); conf.onFBResize(that, fb_width, fb_height);
console.log("desktop");
display.resize(fb_width, fb_height); display.resize(fb_width, fb_height);
timing.fbu_rt_start = (new Date()).getTime(); timing.fbu_rt_start = (new Date()).getTime();
// Send a new non-incremental request // Send a new non-incremental request

9
include/ui.js
View File

@ -47,7 +47,7 @@ load: function (callback) {
onresize: function (callback) { onresize: function (callback) {
// Control-bar height: 36px + // Control-bar height: 36px +
// border height: 5px = 41px to be deducted from the height // border height: 5px = 41px to be deducted from the height
//UI.rfb.setDesktopSize(window.innerWidth, window.innerHeight - 41); UI.rfb.setDesktopSize(window.innerWidth, window.innerHeight - 41);
}, },
// Render default UI and initialize settings menu // Render default UI and initialize settings menu
@ -298,10 +298,6 @@ forceSetting: function(name, val) {
// Show the popup status panel // Show the popup status panel
togglePopupStatusPanel: function() { togglePopupStatusPanel: function() {
console.log("clip: " + UI.getSetting('clip'));
console.log("cur_clip: " + UI.rfb.get_display().get_viewport());
var psp = $D('noVNC_popup_status_panel'); var psp = $D('noVNC_popup_status_panel');
if (UI.popupStatusOpen === true) { if (UI.popupStatusOpen === true) {
psp.style.display = "none"; psp.style.display = "none";
@ -701,9 +697,6 @@ setViewClip: function(clip) {
clip = UI.getSetting('clip'); clip = UI.getSetting('clip');
} }
console.log("clip: " + clip);
console.log("cur_clip: " + cur_clip);
if (clip && !cur_clip) { if (clip && !cur_clip) {
// Turn clipping on // Turn clipping on
UI.updateSetting('clip', true); UI.updateSetting('clip', true);