fly/fgdata
1
0
Fork 0
Code Activity

fix #1834: not taps in Phi

Browse source 
Allow missing config.json in fg-home.
This commit is contained in:
Torsten Dreyer 2016-01-19 09:44:04 +01:00
parent 6039937023
commit 6c98468d19
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Phi/main.js
View file

@ -203,8 +203,11 @@ require([
jquery.get('/config.json', null, function(config) { jquery.get('/config.json', null, function(config) {
var userConfig = {}
// merge user config into global config // 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 ) { for ( var p in userConfig.plugins ) {
config.plugins[p] = userConfig.plugins[p]; config.plugins[p] = userConfig.plugins[p];
} }