diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-25 11:39:07 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-25 15:20:42 +0000 |
| commit | 6c91641271e536ffaa88a1dff5127e42ee99a91e (patch) | |
| tree | 703d9dd49602377ddc90cbf886aad37913f2496b /chromium/chrome/browser/resources/help/help_page.js | |
| parent | b145b7fafd36f0c260d6a768c81fc14e32578099 (diff) | |
| download | qtwebengine-chromium-6c91641271e536ffaa88a1dff5127e42ee99a91e.tar.gz | |
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources.
Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/chrome/browser/resources/help/help_page.js')
| -rw-r--r-- | chromium/chrome/browser/resources/help/help_page.js | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/chromium/chrome/browser/resources/help/help_page.js b/chromium/chrome/browser/resources/help/help_page.js index d3d53dc50c5..4269098fc15 100644 --- a/chromium/chrome/browser/resources/help/help_page.js +++ b/chromium/chrome/browser/resources/help/help_page.js @@ -165,7 +165,9 @@ cr.define('help', function() { var logo = $('product-logo'); logo.onclick = function(e) { logo.classList.remove('spin'); - setTimeout(function() { logo.classList.add('spin'); }, 0); + // Force a style recalc that cancels the animation specified by "spin". + getComputedStyle(logo).getPropertyValue('animation-name'); + logo.classList.add('spin'); }; // Attempt to update. @@ -330,6 +332,9 @@ cr.define('help', function() { } else if (status == 'failed') { this.setUpdateImage_('failed'); $('update-status-message').innerHTML = message; + } else if (status == 'disabled_by_admin') { + this.setUpdateImage_('disabled-by-admin'); + $('update-status-message').innerHTML = message; } if (cr.isChromeOS) { @@ -427,7 +432,7 @@ cr.define('help', function() { * @private */ setObsoleteSystem_: function(obsolete) { - if (cr.isMac && $('update-obsolete-system-container')) { + if ($('update-obsolete-system-container')) { $('update-obsolete-system-container').hidden = !obsolete; } }, @@ -438,8 +443,7 @@ cr.define('help', function() { * @private */ setObsoleteSystemEndOfTheLine_: function(endOfTheLine) { - if (cr.isMac && - $('update-obsolete-system-container') && + if ($('update-obsolete-system-container') && !$('update-obsolete-system-container').hidden && $('update-status-message')) { $('update-status-message').hidden = endOfTheLine; |