diff --git a/ChangeLog b/ChangeLog index 605c4426..fdac7986 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012.*.*, Version 0.1.9 + +* Changed the way of getting github application id +(now it's just from config, rest api removed). + + 2012.12.12, Version 0.1.8 * Added ability to shutdown Cloud Commander diff --git a/config.json b/config.json index 3c8d7ff1..f21f6665 100644 --- a/config.json +++ b/config.json @@ -3,7 +3,7 @@ "appcache" : false, "cache" : {"allowed" : false}, "minification" : { - "js" : true, + "js" : false, "css" : true, "html" : true, "img" : true diff --git a/lib/client/storage/_github.js b/lib/client/storage/_github.js index 1bbb5e2f..0f582e6b 100644 --- a/lib/client/storage/_github.js +++ b/lib/client/storage/_github.js @@ -43,13 +43,9 @@ var CloudCommander, Util, DOM, $, Github, cb; } function setConfig(pCallBack){ - - DOM.ajax({ - url : GitHubIdURL, - success : function(pData){ - GitHub_ID = pData; - Util.exec(pCallBack); - } + cloudcmd.getConfig(function(pConfig){ + GitHub_ID = pConfig.github_key; + Util.exec(pCallBack); }); } diff --git a/lib/server/rest.js b/lib/server/rest.js index 260296d2..f9a7b1e8 100644 --- a/lib/server/rest.js +++ b/lib/server/rest.js @@ -105,30 +105,12 @@ */ function onGET(pParams){ var lResult = {error: 'command not found'}, - lCmd = pParams.command, - lConfig = main.config, - lEnv = process.env, - lEnvKey, - lConfigKey; + lCmd = pParams.command; switch(lCmd){ case '': lResult = {info: 'Cloud Commander API v1'}; break; - - case 'github_key': - lEnvKey = lEnv.github_key; - lConfigKey = lConfig.github_key, - - lResult = lEnvKey || lConfigKey; - break; - - case 'dropbox_chooser_key': - lEnvKey = lEnv.dropbox_chooser_key; - lConfigKey = lConfig.dropbox_chooser_key; - - lResult = lEnvKey || lConfigKey; - break; case 'kill': pParams.data = {