Chromoting: Move set(Client|Host)Mode into remoting namespace.

remoting/webapp/me2mom/remoting.js

Index: remoting/webapp/me2mom/remoting.js
diff --git a/remoting/webapp/me2mom/remoting.js b/remoting/webapp/me2mom/remoting.js
index 9a73dfb3d5986c56c1bc5f38daa69a1dd9ef827d..84e0855591c1632bc883b816aa57fbda6500ed26 100644
--- a/remoting/webapp/me2mom/remoting.js
+++ b/remoting/webapp/me2mom/remoting.js
@@ -174,8 +174,8 @@ remoting.init = function() {
 
   updateAuthStatus_();
   refreshEmail_();
-  setHostMode('unshared');
-  setClientMode('unconnected');
+  remoting.setHostMode('unshared');
+  remoting.setClientMode('unconnected');
   setGlobalMode(getAppStartupMode());
   addClass(document.getElementById('loading-mode'), 'hidden');
   removeClass(document.getElementById('choice-mode'), 'hidden');
@@ -224,14 +224,14 @@ function setGlobalModePersistent(mode) {
   }
 }
 
-function setHostMode(mode) {
+remoting.setHostMode = function(mode) {
   var section = document.getElementById('host-panel');
   var modes = section.getElementsByClassName('mode');
   remoting.debug.log('Host mode: ' + mode);
   setMode_(mode, modes);
 }
 
-function setClientMode(mode) {
+remoting.setClientMode = function(mode) {
   var section = document.getElementById('client-panel');
   var modes = section.getElementsByClassName('mode');
   remoting.debug.log('Client mode: ' + mode);
@@ -245,7 +245,7 @@ function showWaiting_() {
   document.getElementById('cancel-button').disabled = false;
 }
 
-function tryShare() {
+remoting.tryShare = function() {
   remoting.debug.log('Attempting to share...');
   if (remoting.oauth2.needsNewAccessToken()) {
     remoting.debug.log('Refreshing token...');
@@ -255,7 +255,7 @@ function tryShare() {
         showShareError_('unable-to-get-token');
         throw 'Unable to get access token';
       }
-      tryShare();
+      remoting.tryShare();
     });
     return;
   }
@@ -266,6 +266,7 @@ function tryShare() {
   var plugin = document.createElement('embed');
   plugin.setAttribute('type', remoting.PLUGIN_MIMETYPE);
   plugin.setAttribute('hidden', 'true');
+

[Jamie, 2011/07/08 16:09:45]

Is this blank line deliberate? I can't see why it's been added.

[garykac, 2011/07/08 17:36:42]

Curious. It was not intended. Removed.

   plugin.setAttribute('id', remoting.HOST_PLUGIN_ID);
   div.appendChild(plugin);
   plugin.onStateChanged = onStateChanged_;
@@ -273,13 +274,12 @@ function tryShare() {
   plugin.connect(getEmail(),
                  'oauth2:' + remoting.oauth2.getAccessToken());
 }
-remoting.tryShare = tryShare;
 
 function onStateChanged_() {
   var plugin = document.getElementById(remoting.HOST_PLUGIN_ID);
   var state = plugin.state;
   if (state == plugin.REQUESTED_ACCESS_CODE) {
-    setHostMode('preparing-to-share');
+    remoting.setHostMode('preparing-to-share');
   } else if (state == plugin.RECEIVED_ACCESS_CODE) {
     var accessCode = plugin.accessCode;
     var accessCodeDisplay = document.getElementById('access-code-display');
@@ -291,12 +291,12 @@ function onStateChanged_() {
       nextFourDigits.innerText = accessCode.substring(i, i + kDigitsPerGroup);
       accessCodeDisplay.appendChild(nextFourDigits);
     }
-    setHostMode('ready-to-share');
+    remoting.setHostMode('ready-to-share');
   } else if (state == plugin.CONNECTED) {
-    setHostMode('shared');
+    remoting.setHostMode('shared');
   } else if (state == plugin.DISCONNECTED) {
     setGlobalMode(remoting.AppMode.HOST);
-    setHostMode('unshared');
+    remoting.setHostMode('unshared');
     plugin.parentNode.removeChild(plugin);
   } else {
     remoting.debug.log('Unknown state -> ' + state);
@@ -315,15 +315,14 @@ function showShareError_(errorCode) {
   var errorDiv = document.getElementById(errorCode);
   errorDiv.style.display = 'block';
   remoting.debug.log("Sharing error: " + errorCode);
-  setHostMode('share-failed');
+  remoting.setHostMode('share-failed');
 }
 
-function cancelShare() {
+remoting.cancelShare = function() {
   remoting.debug.log('Canceling share...');
   var plugin = document.getElementById(remoting.HOST_PLUGIN_ID);
   plugin.disconnect();
 }
-remoting.cancelShare = cancelShare;
 
 /**
  * Show a client message that stays on the screeen until the state changes.
@@ -419,7 +418,7 @@ function showConnectError_(responseCode, responseString) {
     responseNode.innerText = responseString + ' (' + responseCode + ')';
   }
   remoting.accessCode = '';
-  setClientMode('connect-failed');
+  remoting.setClientMode('connect-failed');
 }
 
 function parseServerResponse_(xhr) {
@@ -454,14 +453,14 @@ function resolveSupportId(supportId) {
       headers);
 }
 
-function tryConnect() {
+remoting.tryConnect = function() {
   if (remoting.oauth2.needsNewAccessToken()) {
     remoting.oauth2.refreshAccessToken(function() {
       if (remoting.oauth2.needsNewAccessToken()) {
         // If we still need it, we're going to infinite loop.
         throw 'Unable to get access token.';
       }
-      tryConnect();
+      remoting.tryConnect();
     });
     return;
   }
@@ -473,16 +472,15 @@ function tryConnect() {
     showConnectError_(404);
   } else {
     var supportId = remoting.accessCode.substring(0, kSupportIdLen);
-    setClientMode('connecting');
+    remoting.setClientMode('connecting');
     resolveSupportId(supportId);
   }
 }
-remoting.tryConnect = tryConnect;
 
-function cancelPendingOperation() {
+remoting.cancelPendingOperation = function() {
   document.getElementById('cancel-button').disabled = true;
   if (remoting.currentMode == remoting.AppMode.HOST) {
-    cancelShare();
+    remoting.cancelShare();
   }
 }