Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1875)

Unified Diff: chrome/browser/resources/chromeos/login/screen_supervised_user_creation.js

Issue 1411423006: Simplifed logic of showing/hiding cancel buttons on login screens. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Small fix. Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/chromeos/login/screen_supervised_user_creation.js
diff --git a/chrome/browser/resources/chromeos/login/screen_supervised_user_creation.js b/chrome/browser/resources/chromeos/login/screen_supervised_user_creation.js
index cc0bc952e8e39b79efe49bd3dacedbe3fb8a5ddb..63183d3e5ca1cbdd67545e2429a64bc0ed73ba20 100644
--- a/chrome/browser/resources/chromeos/login/screen_supervised_user_creation.js
+++ b/chrome/browser/resources/chromeos/login/screen_supervised_user_creation.js
@@ -1100,8 +1100,8 @@ login.createScreen('SupervisedUserCreationScreen',
'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 anyth
var pageButtons = {'intro' : 'start',
'error' : 'error',
'import' : 'import',
@@ -1126,12 +1126,6 @@ login.createScreen('SupervisedUserCreationScreen',
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;
@@ -1329,7 +1323,6 @@ login.createScreen('SupervisedUserCreationScreen',
control.disabled = value;
}
$('login-header-bar').disabled = value;
- $('cancel-add-user-button').disabled = false;
},
/**

Powered by Google App Engine
This is Rietveld 408576698