Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / renderer / resources / neterror.js

diff --git a/src/chrome/renderer/resources/neterror.js b/src/chrome/renderer/resources/neterror.js
index 4daeb3f..360d0b8 100644 (file)
--- a/src/chrome/renderer/resources/neterror.js
+++ b/src/chrome/renderer/resources/neterror.js
@@ -29,7 +29,6 @@ if (window.top.location != window.location)
 // Re-renders the error page using |strings| as the dictionary of values.
 // Used by NetErrorTabHelper to update DNS error pages with probe results.
 function updateForDnsProbe(strings) {
-  i18nTemplate.process(document, strings);
   var context = new JsEvalContext(strings);
   jstProcess(context, document.getElementById('t'));
 }
@@ -108,8 +107,7 @@ var primaryControlOnLeft = true;
 primaryControlOnLeft = false;
 </if>
 
-// Sets up the proper button layout for the current platform.
-function setButtonLayout() {
+function onDocumentLoad() {
   var buttonsDiv = document.getElementById('buttons');
   var controlButtonDiv = document.getElementById('control-buttons');
   var reloadButton = document.getElementById('reload-button');
@@ -119,6 +117,7 @@ function setButtonLayout() {
   var primaryButton = reloadButton;
   var secondaryButton = staleLoadButton;
 
+  // Sets up the proper button layout for the current platform.
   if (primaryControlOnLeft) {
     buttons.classList.add('suggested-left');
     controlButtonDiv.insertBefore(primaryButton, secondaryButton);
@@ -132,19 +131,27 @@ function setButtonLayout() {
     detailsButton.classList.add('singular');
   }
 
-  if (templateData) {
-    // Hide the details button if there are no details to show.
-    if (templateData.summary && !templateData.summary.msg) {
-      detailsButton.style.display = 'none';
-      document.getElementById('help-box-outer').style.display = 'block';
-    }
-
-    // Show control buttons.
-    if (templateData.reloadButton && templateData.reloadButton.msg ||
-        templateData.staleLoadButton && templateData.staleLoadButton.msg) {
-      controlButtonDiv.hidden = false;
-    }
+  // Hide the details button if there are no details to show.
+  if (loadTimeData.valueExists('summary') &&
+          !loadTimeData.getValue('summary').msg) {
+    detailsButton.style.display = 'none';
+    document.getElementById('help-box-outer').style.display = 'block';
+  }
+
+  // Show control buttons.
+  if (loadTimeData.valueExists('reloadButton') &&
+          loadTimeData.getValue('reloadButton').msg ||
+      loadTimeData.valueExists('staleLoadButton') &&
+          loadTimeData.getValue('staleLoadButton').msg) {
+    controlButtonDiv.hidden = false;
+  }
+
+  // Add a main message paragraph.
+  if (loadTimeData.valueExists('primaryParagraph')) {
+    var p = document.querySelector('#main-message p');
+    p.innerHTML = loadTimeData.getString('primaryParagraph');
+    p.hidden = false;
   }
 }
 
-document.addEventListener('DOMContentLoaded', setButtonLayout);
+document.addEventListener('DOMContentLoaded', onDocumentLoad);