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

remoting/webapp/me2mom/remoting.js

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 var remoting = remoting || {};
 
 (function() {
 "use strict";
 
 /** @enum {string} */
@@ skipping 156 matching lines @@
   }
 }
 
 remoting.init = function() {
   // Create global objects.
   remoting.oauth2 = new remoting.OAuth2();
   remoting.debug = new remoting.DebugLog(document.getElementById('debug-log'));
 
   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');
 }
 
 function setGlobalMode(mode) {
   var elementsToShow = [];
   var elementsToHide = [];
   var hostElements = document.getElementsByClassName('host-element');
   hostElements = Array.prototype.slice.apply(hostElements);
@@ skipping 28 matching lines @@
   setGlobalMode(mode);
   // TODO(ajwong): Does it make sense for "in_session" to be a peer to "host"
   // or "client mode"?  I don't think so, but not sure how to restructure UI.
   if (mode != remoting.AppMode.IN_SESSION) {
     remoting.storage.setStartupMode(mode);
   } else {
     remoting.storage.setStartupMode(remoting.AppMode.CLIENT);
   }
 }
 
-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);
   setMode_(mode, modes);
 }
 
 function showWaiting_() {
   showElement(document.getElementById('client-footer-text'), false);
   showElement(document.getElementById('host-footer-text'), false);
   showElement(document.getElementById('waiting-footer'), true);
   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...');
     remoting.oauth2.refreshAccessToken(function() {
       if (remoting.oauth2.needsNewAccessToken()) {
         // If we still need it, we're going to infinite loop.
         showShareError_('unable-to-get-token');
         throw 'Unable to get access token';
       }
-      tryShare();
+      remoting.tryShare();
     });
     return;
   }
 
   showWaiting_();
 
   var div = document.getElementById('host-plugin-container');
   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_;
   plugin.logDebugInfo = debugInfoCallback_;
   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');
     accessCodeDisplay.innerText = '';
     // Display the access code in groups of four digits for readability.
     for (var i = 0; i < accessCode.length; i += kDigitsPerGroup) {
       var nextFourDigits = document.createElement('span');
       nextFourDigits.className = 'access-code-digit-group';
       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);
   }
 }
 
 /**
 * This is that callback that the host plugin invokes to indicate that there
 * is additional debug log info to display.
 */
 function debugInfoCallback_(msg) {
   remoting.debug.log('plugin: ' + msg);
 }
 
 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.
  *
  * @param {string} message The message to display.
  */
 function setClientStateMessage(message) {
   var msg = document.getElementById('session-status-message');
   msg.innerText = message;
 }
@@ skipping 75 matching lines @@
   if (responseCode == 404) {
     invalid.style.display = 'block';
     other.style.display = 'none';
   } else {
     invalid.style.display = 'none';
     other.style.display = 'block';
     var responseNode = document.getElementById('server-response');
     responseNode.innerText = responseString + ' (' + responseCode + ')';
   }
   remoting.accessCode = '';
-  setClientMode('connect-failed');
+  remoting.setClientMode('connect-failed');
 }
 
 function parseServerResponse_(xhr) {
   if (xhr.status == 200) {
     var host = JSON.parse(xhr.responseText);
     if (host.data && host.data.jabberId) {
       remoting.hostJid = host.data.jabberId;
       remoting.hostPublicKey = host.data.publicKey;
       startSession_();
       return;
@@ skipping 14 matching lines @@
   };
 
   remoting.xhr.get(
       'https://www.googleapis.com/chromoting/v1/support-hosts/' +
           encodeURIComponent(supportId),
       parseServerResponse_,
       '',
       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;
   }
   var accessCode = document.getElementById('access-code-entry').value;
   remoting.accessCode = normalizeAccessCode_(accessCode);
   // At present, only 12-digit access codes are supported, of which the first
   // 7 characters are the supportId.
   if (remoting.accessCode.length != kAccessCodeLen) {
     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();
   }
 }
 
 /**
  * Changes the major-mode of the application (Eg., client or host).
  *
  * @param {remoting.AppMode} mode The mode to shift the application into.
  * @return {void}
  */
 remoting.setAppMode = function(mode) {
@@ skipping 15 matching lines @@
 }
 
 remoting.toggleScaleToFit = function() {
   remoting.scaleToFit = !remoting.scaleToFit;
   document.getElementById('scale-to-fit-toggle').value =
       remoting.scaleToFit ? 'No scaling' : 'Scale to fit';
   remoting.session.toggleScaleToFit(remoting.scaleToFit);
 }
 
 }());