Improved activation logic to cover few more edge cases. Removed button that w...

chrome/browser/resources/mobile_setup.js

 // Copyright (c) 2010 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.
 
 
 cr.define('mobile', function() {
 
   function MobileSetup() {
   }
 
@@ skipping 28 matching lines @@
       if (this.initialized_) {
         console.log('calling initialize() again?');
         return;
       }
       this.initialized_ = true;
       self = this;
       this.frameName_ = frame_name;
       window.addEventListener('message', function(e) {
           self.onMessageReceived_(e);
       });
-      $('cheat').addEventListener('click', function(e) {
-        console.log('calling setTransactionStatus from cheat.onclick');
-        if (self.faked_transaction_)
-          return;
-        $('paymentForm').classList.add('hidden');
-        chrome.send('setTransactionStatus', ['OK']);
-        self.faked_transaction_ = true;
-      });
       $(frame_name).addEventListener('load', function(e) {
         // Flip the visibility of the payment page only after the frame is
         // fully loaded.
         if (self.state_ == MobileSetup.PLAN_ACTIVATION_SHOWING_PAYMENT) {
           $('statusHeader').textContent = '';
           $('finalMessage').classList.add('hidden');
           $('errorMessage').classList.add('hidden');
           $('systemStatus').classList.add('hidden');
+          $('canvas').classList.add('hidden');
           $('paymentForm').classList.remove('hidden');
         }
       });
 
       this.changeState_(MobileSetup.PLAN_ACTIVATION_LOADING);
       setInterval(mobile.MobileSetup.drawProgress, 100);
       // Kick off activation process.
       chrome.send('startActivation', []);
     },
 
@@ skipping 22 matching lines @@
 
     changeState_: function(deviceInfo) {
       var new_state = deviceInfo.state;
       if (this.state_ == new_state)
         return;
       var main = $('mainbody');
       // Map handler state to UX.
       switch(new_state) {
         case MobileSetup.PLAN_ACTIVATION_LOADING:
         case MobileSetup.PLAN_ACTIVATION_START:
+        case MobileSetup.PLAN_ACTIVATION_RECONNECTING:
           $('statusHeader').textContent =
               MobileSetup.localStrings_.getString('connecting_header');
           $('errorMessage').textContent = '';
           $('paymentForm').classList.add('hidden');
           $('finalMessage').classList.add('hidden');
           $('errorMessage').classList.add('hidden');
           $('systemStatus').classList.remove('hidden');
+          $('canvas').classList.remove('hidden');
           break;
         case MobileSetup.PLAN_ACTIVATION_INITIATING_ACTIVATION:
-        case MobileSetup.PLAN_ACTIVATION_RECONNECTING:
           $('statusHeader').textContent =
               MobileSetup.localStrings_.getString('activating_header');
           $('errorMessage').textContent = '';
           $('paymentForm').classList.add('hidden');
           $('finalMessage').classList.add('hidden');
           $('errorMessage').classList.add('hidden');
           $('systemStatus').classList.remove('hidden');
+          $('canvas').classList.remove('hidden');
           break;
         case MobileSetup.PLAN_ACTIVATION_SHOWING_PAYMENT:
           $('paymentForm').classList.add('hidden');
           $('finalMessage').classList.add('hidden');
           $('errorMessage').classList.add('hidden');
           $('systemStatus').classList.remove('hidden');
+          $('canvas').classList.remove('hidden');
           this.loadPaymentFrame_(deviceInfo);
           break;
         case MobileSetup.PLAN_ACTIVATION_DONE:
           $('statusHeader').textContent = '';
           $('errorMessage').classList.add('hidden');
           $('systemStatus').classList.add('hidden');
+          $('canvas').classList.add('hidden');
           $('paymentForm').classList.remove('hidden');
           $('finalMessage').classList.remove('hidden');
           break;
         case MobileSetup.PLAN_ACTIVATION_ERROR:
           $('statusHeader').textContent =
               MobileSetup.localStrings_.getString('error_header');
           $('errorMessage').textContent = deviceInfo.error;
           $('paymentForm').classList.add('hidden');
           $('finalMessage').classList.add('hidden');
+          $('canvas').classList.add('hidden');
           $('errorMessage').classList.remove('hidden');
           $('systemStatus').classList.remove('hidden');

[oshima, 2010/11/16 05:44:37]

just a suggestion for future. no need to consider now.

May be we should have show/hide function which takes an id, or may be add
show/hide method to DIV element?

[zel, 2010/11/16 05:56:06]

It's a mixed content that is shown. Yes, it would be better to have a separate
div for each state. Originally, there was is a nicer way to handle visibility
with dom properties and CSS selectors that magically stopped working for me on
this page. I had no time to investigate that one...

           break;
       }
       this.state_ = new_state;
     },
 
     updateDeviceStatus_: function(deviceInfo) {
       this.changeState_(deviceInfo);
     },
 
     sendDeviceInfo_ : function() {
@@ skipping 59 matching lines @@
     mobile.MobileSetup.getInstance().initialize('paymentForm');
   };
 
   // Export
   return {
     MobileSetup: MobileSetup
   };
 
 });