From 2f30bfda6a63b036087cbdbd9b4b10dce2787ed2 Mon Sep 17 00:00:00 2001
From: coderaiser <mnemonic.enemy@gmail.com>
Date: Tue, 4 Dec 2012 09:46:15 -0500
Subject: [PATCH] added ability to read dropbox key from config

---
 ChangeLog                      |  2 ++
 config.json                    |  4 ++--
 lib/client.js                  |  4 +++-
 lib/client/storage/_dropbox.js | 22 +++++++++++++---------
 lib/client/storage/_github.js  |  2 +-
 5 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 29f3aa05..4b455fbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -154,6 +154,8 @@ Added dropbox_id option.
 
 * Added ability to call dropbox chooser on <ctr> + <d>.
 
+* Added ability to read dropbox key from config.
+
 
 2012.10.01, Version 0.1.7
 
diff --git a/config.json b/config.json
index bf8a5656..865518b4 100644
--- a/config.json
+++ b/config.json
@@ -9,9 +9,9 @@
     },
     "github_id"             : "891c251b925e4e967fa9",
     "github_secret"         : "afe9bed1e810c5dc44c4c2a953fc6efb1e5b0545",
-    "dropbox_id"            : "0nd3ssnp5fp7tqs",
+    "dropbox_key"           : "0nd3ssnp5fp7tqs",
     "dropbox_secret"        : "r61lxpchmk8l06o",
-    "dropbox_chooser_id"    : "o7d6llji052vijk",
+    "dropbox_chooser_key"   : "o7d6llji052vijk",
     "show_keys_panel"       : true,
     "server"    : true,
     "logs"      : false,
diff --git a/lib/client.js b/lib/client.js
index c5baf5fe..fd5b770c 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -484,7 +484,7 @@ function baseInit(pCallBack){
     cloudcmd.KeyBinding();
 }
 
-CloudClient.loadConfig              = function(pCallBack){
+CloudClient.getConfig              = function(pCallBack){
     if(!cloudcmd.Config)
         return DOM.ajax({
             url:'/config.json',
@@ -494,6 +494,8 @@ CloudClient.loadConfig              = function(pCallBack){
                 Util.exec(pCallBack, pConfig);
             }
         });
+    else
+        Util.exec(pCallBack, cloudcmd.Config);
 };
 
 
diff --git a/lib/client/storage/_dropbox.js b/lib/client/storage/_dropbox.js
index 409c383c..2c174b74 100644
--- a/lib/client/storage/_dropbox.js
+++ b/lib/client/storage/_dropbox.js
@@ -26,16 +26,20 @@ var CloudCommander, Util, DOM, Dropbox;
     function load(){
         console.time('dropbox load');
         
-        var lElement = DOM.anyload({
-            src         : 'https://www.dropbox.com/static/api/1/dropbox.js',
-            not_append  : true,
-            id          : 'dropboxjs',
-            func        :  DropBoxStore.choose
-        
+        cloudcmd.getConfig(function(pConfig){
+            var lElement = DOM.anyload({
+                src         : 'https://www.dropbox.com/static/api/1/dropbox.js',
+                not_append  : true,
+                id          : 'dropboxjs',
+                func        :  DropBoxStore.choose
+            
+            });
+    
+            var lDropBoxId = pConfig.dropbox_chooser_key;
+            lElement.setAttribute('data-app-key', lDropBoxId);
+            document.body.appendChild(lElement);
+            console.timeEnd('dropbox load');
         });
-        
-        lElement.setAttribute('data-app-key', 'o7d6llji052vijk');
-        document.body.appendChild(lElement);
     }
 
     DropBoxStore.choose = function(){
diff --git a/lib/client/storage/_github.js b/lib/client/storage/_github.js
index 2972f1c7..a043ec41 100644
--- a/lib/client/storage/_github.js
+++ b/lib/client/storage/_github.js
@@ -4,7 +4,7 @@ var CloudCommander, Util, DOM, $, Github, cb;
 (function(){
     "use strict";
     
-    const   cloudcmd                        = CloudCommander,            
+    const   cloudcmd                        = CloudCommander,
             Cache                           = DOM.Cache,
             
             APIURL                          = '/api/v1',