Move UI-WELCOME_ERROR from a script insertion to a hidden <div>

* store the error message in an extra div for later retrieval Fixes: #10580
elastic · Feb 21, 2018 · 246e7b9 · 246e7b9
1 parent 366f474
commit 246e7b9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/ui/ui_render/bootstrap/template.js.hbs b/src/ui/ui_render/bootstrap/template.js.hbs
@@ -22,13 +22,15 @@ window.onload = function () {
       // make subsequent calls to failure() noop
       failure = function () {};
 
+      // Pull failure text from HTML to ensure proper escaping
+      var failureText = document.getElementById('kibanaLoader__error').innerText;
       var err = document.createElement('h1');
       err.style['color'] = 'white';
       err.style['font-family'] = 'monospace';
       err.style['text-align'] = 'center';
       err.style['background'] = '#F44336';
       err.style['padding'] = '25px';
-      err.innerText = '{{i18n 'UI-WELCOME_ERROR'}}';
+      err.innerText = failureText;
 
       document.body.innerHTML = err.outerHTML;
     }

diff --git a/src/ui/ui_render/views/ui_app.jade b/src/ui/ui_render/views/ui_app.jade
@@ -48,6 +48,10 @@ block content
       animation: rotation .75s .5s infinite linear, fadeIn 1s .5s ease-in-out forwards;
     }
 
+    #kibanaLoader__error {
+      display: none;
+    }
+
     .kibanaWelcomeLogoCircle {
       position: absolute;
       left: 4px;
@@ -109,5 +113,7 @@ block content
         .kibanaWelcomeLogo
     .kibanaWelcomeText
       | #{i18n('UI-WELCOME_MESSAGE')}
+    #kibanaLoader__error
+      | #{i18n('UI-WELCOME_ERROR')}
 
   script(src='#{bundlePath}/app/#{app.getId()}/bootstrap.js')