chrome/browser/sync/resources/gaia_login.html - Issue 6378006: Add Throbber control for DOMUI. Use it everywhere in options and in Sync setup UI.

Unified Diff: chrome/browser/sync/resources/gaia_login.html

Issue 6378006: Add Throbber control for DOMUI. Use it everywhere in options and in Sync setup UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: - Created 9 years, 11 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

« chrome/browser/resources/shared/js/cr/ui/throbber.js ('K') | « chrome/browser/resources/shared_resources.grd ('k') | chrome/browser/sync/resources/setting_up.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/resources/gaia_login.html

diff --git a/chrome/browser/sync/resources/gaia_login.html b/chrome/browser/sync/resources/gaia_login.html

index ff0defe5b0d585634f4a8884b913e7a08a06ba36..0569e75c197ac5c9456b8e46156f59a3edf1099a 100644

--- a/chrome/browser/sync/resources/gaia_login.html

+++ b/chrome/browser/sync/resources/gaia_login.html

@@ -58,11 +58,7 @@

width: 200px;

height: 70px;

}

- #throb {

- background-image: url("../../../../app/resources/throbber.png");

- width: 16px;

- height: 16px;

- background-position: 0px;

+ #logging_in_throbber {

margin: 0px 10px 0px 10px;

}

.toppageverticalspace {

@@ -120,6 +116,11 @@

text-align: center;

}

</style>

+<link rel="stylesheet" href="chrome://resources/css/throbber.css">

+<script src="chrome://resources/js/cr.js"></script>

+<script src="chrome://resources/js/cr/ui.js"></script>

+<script src="chrome://resources/js/cr/ui/throbber.js"></script>

+<script src="chrome://resources/js/util.js"></script>

</head>

<body bgcolor="#ffffff" vlink="#666666"

i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize"

@@ -168,15 +169,10 @@

}

- function advanceThrobber() {

- var throbber = document.getElementById('throb');

- throbber.style.backgroundPositionX =

- ((parseInt(getComputedStyle(throbber).backgroundPositionX) - 16) %

- 576) + 'px';

- }

function showGaiaLogin(args) {

- document.getElementById('throbber_container').style.display = "none";

+ $('logging_in_throbber').visible = false;

document.getElementById('Email').disabled = false;

document.getElementById('Passwd').disabled = false;

@@ -288,13 +284,12 @@

}

acct_text.textContent = translated_text.replace('Google','');

}

- setInterval(advanceThrobber, 30);

+ cr.ui.Throbber.decorate($('logging_in_throbber'));

var args = JSON.parse(chrome.dialogArguments);

showGaiaLogin(args);

}

function sendCredentialsAndClose() {

if (!setErrorVisibility())

return false;

@@ -303,8 +298,8 @@

document.getElementById('CaptchaValue').disabled = true;

document.getElementById('AccessCode').disabled = true;

- var throbber = document.getElementById('throbber_container');

- throbber.style.display = "inline";

+ $('logging_in_throbber').visible = true;

var f = document.getElementById("gaia_loginform");

var result = JSON.stringify({"user" : f.Email.value,

"pass" : f.Passwd.value,

@@ -548,10 +543,7 @@

<tr>

<td>

- <div id="throbber_container" style="display:none;">

- <div id="throb">

- </div>

+ <div id="logging_in_throbber" class="throbber" style="visibility:hidden;"></div>

</td>

<input id="signIn" type="submit" class="gaia le button"