[fix] Switch to attribute-encoding

Former-commit-id: 2cdb0f9
airow · Jun 28, 2016 · fcd369f · fcd369f
1 parent aa5d722
commit fcd369f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/src/ui/public/metadata.js b/src/ui/public/metadata.js
@@ -1,11 +1,9 @@
+import $ from 'jquery';
 import _ from 'lodash';
-// singleton for immutable copy of window.__KBN__
 
-if (!_.has(window, '__KBN__')) {
-  throw new Error('window.__KBN__ must be set for metadata');
-}
+const state = $('[kbn-initial-state]').attr('kbn-initial-state');
+const kbn = window.__KBN__ = JSON.parse(state);
 
-const kbn = _.cloneDeep(window.__KBN__ || {});
 export default deepFreeze(kbn);
 
 function deepFreeze(object) {

diff --git a/src/ui/views/chrome.jade b/src/ui/views/chrome.jade
@@ -1,12 +1,6 @@
 -
   var appName = 'kibana';
 
-  function encoded (data) {
-    var scriptend = /\<\s*\/\s*script\s*>/ig;
-    var concatend = '</" + "script>';
-    return JSON.stringify(data).replace(scriptend, concatend);
-  }
-
 block vars
 
 doctype html
@@ -18,5 +12,5 @@ html(lang='en')
     title Kibana
     block head
   body(kbn-chrome, id='#{appName}-body')
-    script window.__KBN__ = !{encoded(kibanaPayload)};
+    meta(kbn-initial-state=JSON.stringify(kibanaPayload))
     block content