Merge pull request #5 from nikolas/jpm

jpm

2 files changed, 15 insertions, 12 deletions

diff --git a/lib/settings/settings_tab.js b/lib/settings/settings_tab.js
index 976714a..6e28ef6 100644
--- a/lib/settings/settings_tab.js
+++ b/lib/settings/settings_tab.js
@@ -21,10 +21,9 @@
  */
 const tabs = require("sdk/tabs");
 const data = require("sdk/self").data;
-const storage = require("settings/storage").librejsStorage;
-const scriptsCached = require("script_entries/scripts_cache").scriptsCached;
-
-exports.settingsManager = settingsManager;
+const storage = require("./storage").librejsStorage;
+const scriptsCached = require("../script_entries/scripts_cache")
+      .scriptsCached;
 
 let settingsManager = {
     settingsTab: {
diff --git a/lib/settings/storage.js b/lib/settings/storage.js
index bc9fe77..abd42e6 100644
--- a/lib/settings/storage.js
+++ b/lib/settings/storage.js
@@ -23,14 +23,18 @@
 
 const { Cc, Ci, Cu, components } = require("chrome");
 
-var { NetUtil } = Cu.import("resource://gre/modules/NetUtil.jsm");
-var { FileUtils } = Cu.import("resource://gre/modules/FileUtils.jsm");
-var relationChecker = require("js_checker/relation_checker").relationChecker;
+const { NetUtil } = Cu.import("resource://gre/modules/NetUtil.jsm");
+const { FileUtils } = Cu.import("resource://gre/modules/FileUtils.jsm");
+var relationChecker = require("../js_checker/relation_checker")
+    .relationChecker;
 var rc = relationChecker(); // a dummy object for legacy module.
-const AUTHOR_REASON = require("script_entries/free_libraries").AUTHOR_REASON;
-var relationChecker = require("js_checker/relation_checker").relationChecker; 
+const AUTHOR_REASON = require("../script_entries/free_libraries")
+      .AUTHOR_REASON;
+var relationChecker = require("../js_checker/relation_checker")
+    .relationChecker;
 
-const scriptsCached = require("script_entries/scripts_cache").scriptsCached;
+const scriptsCached = require("../script_entries/scripts_cache")
+      .scriptsCached;
 
 let librejsStorage = {
 
@@ -59,7 +63,7 @@ let librejsStorage = {
             NetUtil.asyncFetch(channel, function(inputStream, status) {
 
                 if (!components.isSuccessCode(status)) {
-                    require("script_entries/free_libraries").init();
+                    require("../script_entries/free_libraries").init();
                     that.initialWrite();
                 }
                 
@@ -88,7 +92,7 @@ let librejsStorage = {
         console.debug("About to write free libraries");
         // our file is not populated with default contents.
         // use free_libraries.js to populate.
-        require("script_entries/free_libraries").init();
+        require("../script_entries/free_libraries").init();
         this.writeCacheToDB(callback);
     },