Chromium Code Reviews| Index: chrome/renderer/resources/neterror.js |
| diff --git a/chrome/renderer/resources/neterror.js b/chrome/renderer/resources/neterror.js |
| index b518a87c935abf9c682d56bd2900270d8a06d9b3..7eb410d3c95cac0139a01bd331a977122d508e86 100644 |
| --- a/chrome/renderer/resources/neterror.js |
| +++ b/chrome/renderer/resources/neterror.js |
| @@ -5,19 +5,19 @@ |
| function toggleHelpBox() { |
| var helpBoxOuter = document.getElementById('help-box-outer'); |
| helpBoxOuter.classList.toggle('hidden'); |
| - var moreLessButton = document.getElementById('more-less-button'); |
| + var moreLessSpan = document.getElementById('details-button'); |
| if (helpBoxOuter.classList.contains('hidden')) { |
| - moreLessButton.innerText = moreLessButton.moreText; |
| + moreLessSpan.innerText = moreLessSpan.moreText; |
| } else { |
| - moreLessButton.innerText = moreLessButton.lessText; |
| + moreLessSpan.innerText = moreLessSpan.lessText; |
| } |
| } |
| function diagnoseErrors() { |
| - var extension_id = "idddmepepmjcgiedknnmlbadcokidhoa"; |
| - var diagnose_frame = document.getElementById('diagnose-frame'); |
| - diagnose_frame.innerHTML = |
| - '<iframe src="chrome-extension://' + extension_id + |
| + var extensionId = 'idddmepepmjcgiedknnmlbadcokidhoa'; |
| + var diagnoseFrame = document.getElementById('diagnose-frame'); |
| + diagnoseFrame.innerHTML = |
| + '<iframe src="chrome-extension://' + extensionId + |
| '/index.html"></iframe>'; |
| } |
| @@ -41,7 +41,7 @@ function updateIconClass(classList, newClass) { |
| var oldClass; |
| if (classList.hasOwnProperty('last_icon_class')) { |
| - oldClass = classList['last_icon_class'] |
| + oldClass = classList['last_icon_class']; |
| if (oldClass == newClass) |
| return; |
| } |
| @@ -100,15 +100,34 @@ function moreButtonClick() { |
| } |
| } |
| -<if expr="is_macosx or is_ios or is_linux or is_android"> |
| // Re-orders buttons. Used on Mac, Linux, and Android, where reload should go |
| // on the right. |
| function swapButtonOrder() { |
| + var buttonDiv = document.getElementById('buttons'); |
| var reloadButton = document.getElementById('reload-button'); |
| - var moreLessButton = document.getElementById('more-less-button'); |
| + var detailsButton = document.getElementById('details-button'); |
| var staleLoadButton = document.getElementById('stale-load-button'); |
| - reloadButton.parentNode.insertBefore(moreLessButton, reloadButton); |
| - reloadButton.parentNode.insertBefore(staleLoadButton, reloadButton) |
| -} |
| -document.addEventListener("DOMContentLoaded", swapButtonOrder); |
| + |
| + var primary = reloadButton; |
| + var secondary = staleLoadButton; |
| + var primary_leftmost = true; |
| +<if expr="is_macosx or is_ios or is_linux or is_android"> |
| + primary_leftmost = false; |
| </if> |
| + |
| + if (primary_leftmost) { |
| + buttonDiv.insertBefore(primary, detailsButton); |
| + buttonDiv.insertBefore(secondary, detailsButton); |
| + buttonDiv.className = "salient-left"; |
|
mmenke
2014/08/01 15:52:51
Oh...missed this file. You need to use salient-ri
Randy Smith (Not in Mondays)
2014/08/01 18:14:15
Moot given rewrite, but my intent was that the JS
|
| + } else { |
| + buttonDiv.insertBefore(detailsButton, primary); |
| + buttonDiv.insertBefore(secondary, primary); |
| + buttonDiv.className = "salient-right"; |
| + } |
| + |
| + if (reloadButton.class == "display: none" && |
| + staleLoadButton.class == "display: none") { |
| + buttonDiv.className = "single-button"; |
| + } |
| +} |
| +document.addEventListener('DOMContentLoaded', swapButtonOrder); |