Merge branch 'enableConfigByParse' of github.com:ZBoxApp/manager-react into enableConfigByParse

7d14d23b · Patricio Bruna · 05d9d1fa · d512d8ee · 7d14d23b
Commit 7d14d23b authored Jul 13, 2016 by Patricio Bruna
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

index.jsx src/index.jsx +4 -3

No files found.
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -45,14 +45,15 @@ const notFoundParams = {
 function preRenderSetup(callwhendone) {
    const d1 = Client.getClientConfig(
        (data) => {
+            const config = data.result || data;

-            if (!data) {
+            if (!config) {
                return;
            }

-            global.window.manager_config = data;
+            global.window.manager_config = config;

-            if (data.debug) {
+            if (config.debug) {
                global.window.Client = Client;
                global.window.Utils = Utils;
            }