From bf624cb5d51cd33f794f20cae6046c3853d9bc87 Mon Sep 17 00:00:00 2001 From: Jocelyn Le Sage Date: Thu, 11 May 2017 06:25:28 -0400 Subject: [PATCH] Fixed handling of hideable navbar active change in autoscaling and clipping modules. --- rootfs/opt/novnc/app/modules/autoscaling.js | 4 ++-- rootfs/opt/novnc/app/modules/clipping.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rootfs/opt/novnc/app/modules/autoscaling.js b/rootfs/opt/novnc/app/modules/autoscaling.js index 7eaeca3..57e54b2 100644 --- a/rootfs/opt/novnc/app/modules/autoscaling.js +++ b/rootfs/opt/novnc/app/modules/autoscaling.js @@ -33,7 +33,7 @@ var AutoScalingModule = { activate: function() { // Add event handlers. $(window).on('resize', this.handleWindowResize); - $(document).on('UIModule:DynamicNavbar', this.handleNavbarChange); + $(document).on('UIModule:HideableNavbar', this.handleNavbarChange); // Add RFB callback. UI.rfbFBUCompleteCallbacks.add(this.handleFBUComplete); // Apply autoscaling. @@ -47,7 +47,7 @@ var AutoScalingModule = { deactivate: function() { // Remove event handlers. $(window).off('resize', this.handleWindowResize); - $(document).off('UIModule:DynamicNavbar', this.handleNavbarChange); + $(document).off('UIModule:HideableNavbar', this.handleNavbarChange); // Remove RFB callback. UI.rfbFBUCompleteCallbacks.remove(this.handleFBUComplete); // Apply auto scaling. diff --git a/rootfs/opt/novnc/app/modules/clipping.js b/rootfs/opt/novnc/app/modules/clipping.js index 3dc35fb..50bb54f 100644 --- a/rootfs/opt/novnc/app/modules/clipping.js +++ b/rootfs/opt/novnc/app/modules/clipping.js @@ -28,7 +28,7 @@ var ClippingModule = { activate: function() { // Add event handlers. $(window).on('resize', this.updateDisplay); - $(document).on('UIModule:DynamicNavbar', this.handleUIModuleChange); + $(document).on('UIModule:HideableNavbar', this.handleUIModuleChange); // Add RFB callback. UI.rfbFBUCompleteCallbacks.add(this.updateDisplay); // Enable clipping. @@ -41,7 +41,7 @@ var ClippingModule = { deactivate: function() { // Remove event handlers. $(window).off('resize', this.updateDisplay); - $(document).off('UIModule:DynamicNavbar', this.handleUIModuleChange); + $(document).off('UIModule:HideableNavbar', this.handleUIModuleChange); // Remove RFB callback. UI.rfbFBUCompleteCallbacks.remove(this.updateDisplay); // Disable clipping.