From 6c98468d1984baff0e86c324036c15af49c4146c Mon Sep 17 00:00:00 2001 From: Torsten Dreyer Date: Tue, 19 Jan 2016 09:44:04 +0100 Subject: [PATCH] fix #1834: not taps in Phi Allow missing config.json in fg-home. --- Phi/main.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Phi/main.js b/Phi/main.js index 79b2a8b00..af5b6fafa 100644 --- a/Phi/main.js +++ b/Phi/main.js @@ -203,8 +203,11 @@ require([ jquery.get('/config.json', null, function(config) { + var userConfig = {} // merge user config into global config - jquery.get('/fg-home/Phi/config.json', null, function(userConfig) { + var jqxhr = jquery.get('/fg-home/Phi/config.json', null, function(data) { + userConfig = data; + }).always(function(){ for ( var p in userConfig.plugins ) { config.plugins[p] = userConfig.plugins[p]; }