Selaa lähdekoodia

default_controls.js: Fix cursor setting init.

The rfb variable wasn't available at the point settingsDisabled() was
being called since it was called inline with RFB() initialization. To
solve this we pass the updateState rfb variable so that the canvas can
be queried for setting the cursor_uri value.
Joel Martin 15 vuotta sitten
vanhempi
commit
b5087acc24
1 muutettua tiedostoa jossa 9 lisäystä ja 8 poistoa
  1. 9 8
      include/default_controls.js

+ 9 - 8
include/default_controls.js

@@ -235,16 +235,17 @@ closeSettingsMenu: function() {
 },
 },
 
 
 // Disable/enable controls depending on connection state
 // Disable/enable controls depending on connection state
-settingsDisabled: function(disabled) {
-    var DC = DefaultControls;
+settingsDisabled: function(disabled, rfb) {
+    //Util.Debug(">> settingsDisabled");
     $('VNC_encrypt').disabled = disabled;
     $('VNC_encrypt').disabled = disabled;
     $('VNC_true_color').disabled = disabled;
     $('VNC_true_color').disabled = disabled;
-    if (DC.rfb && DC.rfb.get_canvas().get_cursor_uri()) {
+    if (rfb && rfb.get_canvas().get_cursor_uri()) {
         $('VNC_cursor').disabled = disabled;
         $('VNC_cursor').disabled = disabled;
     } else {
     } else {
         DefaultControls.updateSetting('cursor', false);
         DefaultControls.updateSetting('cursor', false);
         $('VNC_cursor').disabled = true;
         $('VNC_cursor').disabled = true;
     }
     }
+    //Util.Debug("<< settingsDisabled");
 },
 },
 
 
 // Save/apply settings when 'Apply' button is pressed
 // Save/apply settings when 'Apply' button is pressed
@@ -288,7 +289,7 @@ updateState: function(rfb, state, oldstate, msg) {
         case 'fatal':
         case 'fatal':
             c.disabled = true;
             c.disabled = true;
             cad.disabled = true;
             cad.disabled = true;
-            DefaultControls.settingsDisabled(true);
+            DefaultControls.settingsDisabled(true, rfb);
             klass = "VNC_status_error";
             klass = "VNC_status_error";
             break;
             break;
         case 'normal':
         case 'normal':
@@ -296,7 +297,7 @@ updateState: function(rfb, state, oldstate, msg) {
             c.onclick = DefaultControls.disconnect;
             c.onclick = DefaultControls.disconnect;
             c.disabled = false;
             c.disabled = false;
             cad.disabled = false;
             cad.disabled = false;
-            DefaultControls.settingsDisabled(true);
+            DefaultControls.settingsDisabled(true, rfb);
             klass = "VNC_status_normal";
             klass = "VNC_status_normal";
             break;
             break;
         case 'disconnected':
         case 'disconnected':
@@ -306,7 +307,7 @@ updateState: function(rfb, state, oldstate, msg) {
 
 
             c.disabled = false;
             c.disabled = false;
             cad.disabled = true;
             cad.disabled = true;
-            DefaultControls.settingsDisabled(false);
+            DefaultControls.settingsDisabled(false, rfb);
             klass = "VNC_status_normal";
             klass = "VNC_status_normal";
             break;
             break;
         case 'password':
         case 'password':
@@ -315,13 +316,13 @@ updateState: function(rfb, state, oldstate, msg) {
 
 
             c.disabled = false;
             c.disabled = false;
             cad.disabled = true;
             cad.disabled = true;
-            DefaultControls.settingsDisabled(true);
+            DefaultControls.settingsDisabled(true, rfb);
             klass = "VNC_status_warn";
             klass = "VNC_status_warn";
             break;
             break;
         default:
         default:
             c.disabled = true;
             c.disabled = true;
             cad.disabled = true;
             cad.disabled = true;
-            DefaultControls.settingsDisabled(true);
+            DefaultControls.settingsDisabled(true, rfb);
             klass = "VNC_status_warn";
             klass = "VNC_status_warn";
             break;
             break;
     }
     }