Simplifed logic of showing/hiding cancel buttons on login screens.

chrome/browser/resources/chromeos/login/screen_supervised_user_creation.js

 // Copyright 2014 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.
 
 /**
  * @fileoverview Legacy supervised user creation flow screen.
  */
 
 login.createScreen('SupervisedUserCreationScreen',
                    'supervised-user-creation', function() {
@@ skipping 1082 matching lines @@
       this.updateText_();
       $('bubble').hide();
       if (!this.imagesRequested_) {
         chrome.send('supervisedUserGetImages');
         this.imagesRequested_ = true;
       }
       var pageNames = ['intro',
                        'manager',
                        'username',
                        'import',
-                       'error',
-                       'created'];
+                       'created',
+                       'error'];

[Alexander Alekseev, 2015/10/24 05:09:33]

?

[dzhioev (left Google), 2015/10/24 06:13:53]

Same order as in HTML. Doesn't really change anything.

       var pageButtons = {'intro' : 'start',
                          'error' : 'error',
                          'import' : 'import',
                          'import-password' : 'import',
                          'created' : 'gotit'};
       this.hideStatus_();
       var pageToDisplay = visiblePage;
       if (visiblePage == 'import-password')
         pageToDisplay = 'username';
 
       for (i in pageNames) {
         var pageName = pageNames[i];
         var page = $('supervised-user-creation-' + pageName);
         page.hidden = (pageName != pageToDisplay);
         if (pageName == pageToDisplay)
           $('step-logo').hidden = page.classList.contains('step-no-logo');
       }
 
       for (i in this.buttonIds) {
         var button = this.getScreenButton(this.buttonIds[i]);
         button.hidden = button.pages.indexOf(visiblePage) < 0;
         button.disabled = false;
       }
 
-      var pagesWithCancel = ['intro', 'manager', 'username', 'import-password',
-          'error', 'import'];
-      $('login-header-bar').allowCancel =
-          pagesWithCancel.indexOf(visiblePage) > -1;
-      $('cancel-add-user-button').disabled = false;
-
       this.getScreenElement('import-link').hidden = true;
       this.getScreenElement('create-link').hidden = true;
 
       if (pageButtons[visiblePage])
         this.getScreenButton(pageButtons[visiblePage]).focus();
 
       this.currentPage_ = visiblePage;
 
       if (visiblePage == 'manager' || visiblePage == 'intro') {
         $('supervised-user-creation-password').classList.remove(
@@ skipping 177 matching lines @@
       return this.disabled_;
     },
 
     set disabled(value) {
       this.disabled_ = value;
       var controls = this.querySelectorAll('button,input');
       for (var i = 0, control; control = controls[i]; ++i) {
         control.disabled = value;
       }
       $('login-header-bar').disabled = value;
-      $('cancel-add-user-button').disabled = false;
     },
 
     /**
      * Called by backend part to propagate list of possible managers.
      * @param {Array} userList - list of users that can be managers.
      */
     loadManagers: function(userList) {
       $('supervised-user-creation-managers-block').hidden = false;
       this.managerList_.clearPods();
       for (var i = 0; i < userList.length; ++i)
@@ skipping 249 matching lines @@
 
       if (selectedIndex >= 0)
         this.importList_.selectPod(this.importList_.pods[selectedIndex]);
 
       if (this.currentPage_ == 'username')
         this.getScreenElement('import-link').hidden = (userList.length == 0);
     },
   };
 });