Fixed issue with config.js loading.

LuisSala · Aug 24, 2011 · 7caa127 · 7caa127
1 parent b921dd7
commit 7caa127
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/assets/bpm_libs.js b/assets/bpm_libs.js
diff --git a/lib/config.sample.js → lib/config.js.sample b/lib/config.sample.js → lib/config.js.sample
@@ -1,5 +1,4 @@
 // Copy this file to <project_home>/lib/config.js and supply an Instagram client ID.
-
-var CONFIG = {};
-
-CONFIG.INSTAGRAM_CLIENT_ID = "SUPPLY_INSTAGRAM_CLIENT_ID_HERE";
+return {
+	INSTAGRAM_CLIENT_ID: "SUPPLY_INSTAGRAM_CLIENT_ID_HERE";
+}
diff --git a/lib/core.js b/lib/core.js
@@ -1,7 +1,7 @@
 require('sproutcore');
 require('sproutcore-datastore');
 
-
+var CONFIG = require('./config');
 var INFO = require('demogram/~package');
 
 window.App = SC.Application.create({
@@ -16,7 +16,7 @@ window.App = SC.Application.create({
     INSTAGRAM_API_INSTAGRAM_API_BASE_URL: "https://api.instagram.com/v1/",
     INSTAGRAM_AUTH_URL: null,
     INSTAGRAM_ACCESS_TOKEN: null,
-    INSTAGRAM_AUTH_STRING: "client_id="+CONFIG.INSTAGRAM_CLIENT_ID, // TODO Please replace this with your own key.
+    INSTAGRAM_AUTH_STRING: "client_id="+CONFIG.INSTAGRAM_CLIENT_ID,
 
     init:function() {
         this._super();

diff --git a/lib/main.js b/lib/main.js
@@ -3,7 +3,6 @@
 // Copyright: ©2011 Strobe, Inc. All rights reserved.
 // ==========================================================================
 
-require("./config");
 require('./jquery.json-2.2');
 require('./jstorage');
 require('./core');