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

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

Issue 7779010: Implements frame sniffer to watch iframe loading state. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: clang fix Created 9 years, 4 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/oobe.js
diff --git a/chrome/browser/resources/chromeos/login/oobe.js b/chrome/browser/resources/chromeos/login/oobe.js
index e29b2faf38059f6945ef34cf35861c950ebc263c..27616b77fca30732db8c897705d1c6fe6cc0c5ab 100644
--- a/chrome/browser/resources/chromeos/login/oobe.js
+++ b/chrome/browser/resources/chromeos/login/oobe.js
@@ -136,7 +136,8 @@ cr.define('cr.ui', function() {
// Adjust inner container height based on new step's height.
$('inner-container').style.height = newStep.offsetHeight + 'px';
- if (this.currentStep_ != nextStepIndex) {
+ if (this.currentStep_ != nextStepIndex &&
+ !oldStep.classList.contains('hidden')) {
oldStep.addEventListener('webkitTransitionEnd', function f(e) {
oldStep.removeEventListener('webkitTransitionEnd', f);
oldStep.classList.add('hidden');
@@ -224,7 +225,6 @@ cr.define('cr.ui', function() {
prepareForLoginDisplay_ : function() {
for (var i = 0, screenId; screenId = this.screens_[i]; ++i) {
var screen = $(screenId);
-
screen.classList.add('faded');
screen.classList.remove('right');
screen.classList.remove('left');

Powered by Google App Engine
This is Rietveld 408576698