Add options as a global variable in the injected page

Fix #15.
zalmoxisus · Nov 19, 2015 · 9ba546d · 9ba546d
1 parent 069df42
commit 9ba546d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/src/browser/extension/inject/contentScript.js b/src/browser/extension/inject/contentScript.js
@@ -28,6 +28,11 @@ getOptions(options => {
     sendMessage = sendToBg;
 
     let s = document.createElement('script');
+    s.type = 'text/javascript';
+    s.appendChild(document.createTextNode('window.devToolsOptions=' + JSON.stringify(options)));
+    (document.head || document.documentElement).appendChild(s);
+
+    s = document.createElement('script');
     s.src = chrome.extension.getURL('js/page.bundle.js');
     s.onload = function() {
       this.parentNode.removeChild(this);
@@ -42,14 +47,6 @@ getOptions(options => {
     if (message.source !== 'redux-page') return;
     payload = message.payload;
     sendMessage(message);
-
-    if (message.init) {
-      window.postMessage({
-        type: 'OPTIONS',
-        options: options,
-        source: 'redux-cs'
-      }, '*');
-    }
   }, false);
 
   if (typeof window.onbeforeunload !== 'undefined') {

diff --git a/src/browser/extension/inject/pageScript.js b/src/browser/extension/inject/pageScript.js
@@ -3,7 +3,7 @@ import configureStore from '../../../app/store/configureStore';
 import { ACTION, UPDATE, OPTIONS, COMMIT } from '../../../app/constants/ActionTypes';
 
 window.devToolsInit = function(store) {
-  let options = {};
+  const options = window.devToolsOptions;
   let timeout = { id: null, last: 0};
 
   function doChange(init) {
@@ -51,8 +51,6 @@ window.devToolsInit = function(store) {
       store.liftedStore.dispatch(message.payload);
     } else if (message.type === UPDATE) {
       onChange();
-    } else if (message.type === OPTIONS) {
-      options = message.options;
     }
 
   }