more jpm compatibility

15 files changed, 81 insertions, 71 deletions

diff --git a/lib/addon_management/install_uninstall.js b/lib/addon_management/install_uninstall.js
index c5c150f..7ce73ea 100644
--- a/lib/addon_management/install_uninstall.js
+++ b/lib/addon_management/install_uninstall.js
@@ -27,10 +27,10 @@
 
 const {Cc, Ci, Cu, Cm, Cr} = require("chrome");
 
-const httpObserver = require("http_observer/http_request_observer");
-var narcissusWorker = require("parser/narcissus_worker")
+const httpObserver = require("../http_observer/http_request_observer");
+var narcissusWorker = require("../parser/narcissus_worker")
     .narcissusWorker;
-const caching = require("http_observer/caching");
+const caching = require("../http_observer/caching");
 
 const prompt = Cc["@mozilla.org/embedcomp/prompt-service;1"].
   getService(Ci.nsIPromptService);
diff --git a/lib/addon_management/prefchange.js b/lib/addon_management/prefchange.js
index 910a103..48a8765 100644
--- a/lib/addon_management/prefchange.js
+++ b/lib/addon_management/prefchange.js
@@ -27,7 +27,7 @@ var {Cc, Ci, Cu, Cm, Cr} = require("chrome");
 
 var prompt = Cc['@mozilla.org/embedcomp/prompt-service;1'].
     getService(Ci.nsIPromptService);
-var scriptsCached = require("script_entries/scripts_cache").scriptsCached;
+var scriptsCached = require("../script_entries/scripts_cache").scriptsCached;
 
 var setWhitelist = function () {
     whitelist = [];
diff --git a/lib/html_script_finder/dom_handler.js b/lib/html_script_finder/dom_handler.js
index c57c945..a56f668 100644
--- a/lib/html_script_finder/dom_handler.js
+++ b/lib/html_script_finder/dom_handler.js
@@ -32,33 +32,32 @@
 
 var {Cc, Ci, Cu, Cm, Cr} = require("chrome");
 
-var scriptProperties =
-    require("html_script_finder/dom_handler/script_properties");
+var scriptProperties = require("./dom_handler/script_properties");
 
 const scriptTypes = scriptProperties.scriptTypes;
 const statusTypes = scriptProperties.statusTypes;
 const reasons = scriptProperties.reasons;
 
-var urlHandler = require("url_handler/url_handler");
+var urlHandler = require("../url_handler/url_handler");
 
-var WebLabelFinder =
-    require("html_script_finder/web_labels/js_web_labels").WebLabelFinder;
+var WebLabelFinder = require(".//web_labels/js_web_labels").WebLabelFinder;
 
 // object model for script entries.
-var scriptObject = require("html_script_finder/dom_handler/script_object");
+var scriptObject = require("./dom_handler/script_object");
 
-var privacyChecker = require("js_checker/privacy_checker").privacyCheck;
-var jsChecker = require("js_checker/js_checker");
-const types = require("js_checker/constant_types");
+var privacyChecker = require("../js_checker/privacy_checker").privacyCheck;
+var jsChecker = require("../js_checker/js_checker");
+const types = require("../js_checker/constant_types");
 
 var checkTypes = types.checkTypes;
 
 var stripCDATAOpen = /<\!\[CDATA\[/gi;
 var stripCDATAClose = /]]>/g;
 
-var isDryRun = require("addon_management/prefchange").isDryRun;
-var allowedRef = require('http_observer/allowed_referrers').allowedReferrers;
-var attributeHelpers = require("html_script_finder/dom_handler/attributes");
+var isDryRun = require("../addon_management/prefchange").isDryRun;
+var allowedRef = require('../http_observer/allowed_referrers')
+    .allowedReferrers;
+var attributeHelpers = require("./dom_handler/attributes");
 
 // javascript:*
 var jsInAttrRe = attributeHelpers.jsInAttrRe;
@@ -66,10 +65,8 @@ var jsInAttrRe = attributeHelpers.jsInAttrRe;
 // the list of all available event attributes
 var intrinsicEvents = attributeHelpers.intrinsicEvents;
 
-var domGatherer =
-    require("html_script_finder/dom_handler/dom_gatherer").domGatherer;
-var domChecker  =
-    require("html_script_finder/dom_handler/dom_checker").domChecker;
+var domGatherer = require("./dom_handler/dom_gatherer").domGatherer;
+var domChecker  = require("./dom_handler/dom_checker").domChecker;
 
 /**
  * The DomHandler object takes a whole document,
diff --git a/lib/html_script_finder/dom_handler/attributes.js b/lib/html_script_finder/dom_handler/attributes.js
index 796e718..ac603fe 100644
--- a/lib/html_script_finder/dom_handler/attributes.js
+++ b/lib/html_script_finder/dom_handler/attributes.js
@@ -21,9 +21,8 @@
  */
 
 // object model for script entries.
-var scriptObject = require("html_script_finder/dom_handler/script_object");
-
-var scriptProperties = require("html_script_finder/dom_handler/script_properties");
+var scriptObject = require("./script_object");
+var scriptProperties = require("./script_properties");
 
 const scriptTypes = scriptProperties.scriptTypes;
 
diff --git a/lib/html_script_finder/dom_handler/dom_checker.js b/lib/html_script_finder/dom_handler/dom_checker.js
index 6a98d61..7f02c3f 100644
--- a/lib/html_script_finder/dom_handler/dom_checker.js
+++ b/lib/html_script_finder/dom_handler/dom_checker.js
@@ -30,14 +30,14 @@
 var {Cc, Ci, Cu, Cm, Cr} = require("chrome");
 var timer = require("sdk/timers");
 
-var scriptProperties = require("html_script_finder/dom_handler/script_properties");
+var scriptProperties = require("./script_properties");
 const scriptTypes = scriptProperties.scriptTypes;
 const statusTypes = scriptProperties.statusTypes;
 const reasons = scriptProperties.reasons;
 
 // ensure xhr won't create an infinite loop
 // with html content.
-var urlTester = require("html_script_finder/url_seen_tester").urlSeenTester;
+var urlTester = require("../url_seen_tester").urlSeenTester;
 var urlHandler = require("url_handler/url_handler");
 
 var privacyChecker = require("js_checker/privacy_checker").privacyCheck;
diff --git a/lib/html_script_finder/html_parser.js b/lib/html_script_finder/html_parser.js
index a2bae80..ab36eaf 100644
--- a/lib/html_script_finder/html_parser.js
+++ b/lib/html_script_finder/html_parser.js
@@ -80,7 +80,7 @@
 
 var {Cc, Ci, Cu} = require("chrome");
 
-var domHandlerModule = require("html_script_finder/dom_handler");
+var domHandlerModule = require("./dom_handler");
 
 const PR_UINT32_MAX = 2147483647;
 
diff --git a/lib/http_observer/http_request_observer.js b/lib/http_observer/http_request_observer.js
index e8c9635..0b6e14d 100644
--- a/lib/http_observer/http_request_observer.js
+++ b/lib/http_observer/http_request_observer.js
@@ -31,8 +31,9 @@ var targetMimeTypes = /.*(javascript|ecmascript|html).*/i;
 
 // ensure xhr won't create an infinite loop
 // with html content.
-var urlTester = require("html_script_finder/url_seen_tester").urlSeenTester;
-var streamLoader = require("http_observer/stream_loader").streamLoader;
+var urlTester = require("../html_script_finder/url_seen_tester")
+    .urlSeenTester;
+var streamLoader = require("../http_observer/stream_loader").streamLoader;
 
 var httpRequestObserver = {
     observe: function(request, aTopic, aData) {
diff --git a/lib/http_observer/process_response.js b/lib/http_observer/process_response.js
index 924636b..72f236c 100644
--- a/lib/http_observer/process_response.js
+++ b/lib/http_observer/process_response.js
@@ -27,28 +27,32 @@
 
 var {Cc, Ci, Cu, Cm, Cr} = require("chrome");
 
-var jsChecker = require("js_checker/js_checker");
+var jsChecker = require("../js_checker/js_checker");
 
-const types = require("js_checker/constant_types");
+const types = require("../js_checker/constant_types");
 var checkTypes = types.checkTypes;
 
 // check if scripts embedded dynamically have a jsWebLabel entry indexed by referrer.
-var jsWebLabelEntries = require("html_script_finder/web_labels/js_web_labels").jsWebLabelEntries;
+var jsWebLabelEntries = require("../html_script_finder/web_labels/js_web_labels")
+    .jsWebLabelEntries;
 
-var htmlParser = require("html_script_finder/html_parser");
+var htmlParser = require("../html_script_finder/html_parser");
 
-var removedScripts = require("script_entries/removed_scripts").removedScripts;
-var allowedRef = require('http_observer/allowed_referrers').allowedReferrers;
+var removedScripts = require("../script_entries/removed_scripts")
+    .removedScripts;
+var allowedRef = require('../http_observer/allowed_referrers')
+    .allowedReferrers;
 
-var acceptedScripts = require("script_entries/accepted_scripts").acceptedScripts;
+var acceptedScripts = require("../script_entries/accepted_scripts")
+    .acceptedScripts;
 
 // used to display info when a url is whitelisted.
-var dryRunScripts = require("script_entries/dryrun_scripts").dryRunScripts;
+var dryRunScripts = require("../script_entries/dryrun_scripts").dryRunScripts;
 
 // node.js url module. Makes it easier to resolve
 // urls in that datauri loaded dom
-var urlHandler = require("url_handler/url_handler");
-var isDryRun = require("addon_management/prefchange").isDryRun;
+var urlHandler = require("../url_handler/url_handler");
+var isDryRun = require("../addon_management/prefchange").isDryRun;
 
 var jsMimeTypeRe = /.*(javascript|ecmascript).*/i;
 var htmlMimeTypeRe = /.*(xhtml\+xml|html|multipart\/x-mixed-replace).*/i;
diff --git a/lib/http_observer/stream_loader.js b/lib/http_observer/stream_loader.js
index ec21cb7..c790fe2 100644
--- a/lib/http_observer/stream_loader.js
+++ b/lib/http_observer/stream_loader.js
@@ -21,7 +21,7 @@
  */
 var {Cc, Ci, Cu, Cm, Cr} = require("chrome");
 
-const processResponse = require('http_observer/process_response');
+const processResponse = require('./process_response');
 const CHARSETS = [
     '866', 'ansi_x3.4-1968', 'arabic', 'ascii', 'asmo-708', 'big5',
     'big5-hkscs', 'chinese', 'cn-big5', 'cp1250', 'cp1251', 'cp1252',
diff --git a/lib/js_checker/js_checker.js b/lib/js_checker/js_checker.js
index 21bfeaf..4a3dfb9 100644
--- a/lib/js_checker/js_checker.js
+++ b/lib/js_checker/js_checker.js
@@ -23,16 +23,17 @@
 
 var {Cc, Ci, Cu, Cm, Cr} = require("chrome");
 
-var narcissusWorker = require("parser/narcissus_worker")
+var narcissusWorker = require("../parser/narcissus_worker")
     .narcissusWorker;
 
-const nonTrivialModule = require("js_checker/nontrivial_checker");
-const freeChecker = require("js_checker/free_checker");
-const relationChecker = require("js_checker/relation_checker");
-const types = require("js_checker/constant_types");
+const nonTrivialModule = require("./nontrivial_checker");
+const freeChecker = require("./free_checker");
+const relationChecker = require("./relation_checker");
+const types = require("./constant_types");
 
-const scriptsCached = require("script_entries/scripts_cache").scriptsCached;
-var isDryRun = require("addon_management/prefchange").isDryRun;
+const scriptsCached = require("../script_entries/scripts_cache")
+      .scriptsCached;
+var isDryRun = require("../addon_management/prefchange").isDryRun;
 
 var checkTypes = types.checkTypes;
 
@@ -165,7 +166,8 @@ JsChecker.prototype.isFreeLicensed = function(script) {
  */
 JsChecker.prototype.searchJs = function(jsCode, resultReady, url) {
     var that = this;
-    var bugfix = require('html_script_finder/bug_fix').narcissusBugFixLibreJS;
+    var bugfix = require('../html_script_finder/bug_fix')
+        .narcissusBugFixLibreJS;
     console.debug('JsChecker.searchJs for script url:', url);
     this.url = url;
     this.resultReady = resultReady;
diff --git a/lib/js_checker/relation_checker.js b/lib/js_checker/relation_checker.js
index c504444..21580a9 100644
--- a/lib/js_checker/relation_checker.js
+++ b/lib/js_checker/relation_checker.js
@@ -25,7 +25,7 @@
  * Finds out if two scripts are related to each other.
  *
  */
-const types = require("js_checker/constant_types");
+const types = require("./constant_types");
 
 const token = types.token;
 
diff --git a/lib/script_entries/free_libraries.js b/lib/script_entries/free_libraries.js
index 8821d04..e7b9a3f 100644
--- a/lib/script_entries/free_libraries.js
+++ b/lib/script_entries/free_libraries.js
@@ -22,9 +22,10 @@
 
 // THIS MODULE IS DEPRECATED IN FAVOR OF THE NEW WHITELISTING MODULE (LibreJS 6.0)
 
-var relationChecker = require("js_checker/relation_checker").relationChecker;
-var checkTypes = require("js_checker/constant_types").checkTypes;
-var scriptsCached = require("script_entries/scripts_cache").scriptsCached;
+var relationChecker = require("../js_checker/relation_checker")
+    .relationChecker;
+var checkTypes = require("../js_checker/constant_types").checkTypes;
+var scriptsCached = require("./scripts_cache").scriptsCached;
 
 
 // find the json database path.
diff --git a/lib/script_entries/scripts_cache.js b/lib/script_entries/scripts_cache.js
index 47ab069..a09f94e 100644
--- a/lib/script_entries/scripts_cache.js
+++ b/lib/script_entries/scripts_cache.js
@@ -19,14 +19,14 @@
  * You should have received a copy of the GNU General Public License
  * along with GNU LibreJS.  If not, see <http://www.gnu.org/licenses/>.
  */
-var relationCheckerObj = require("js_checker/relation_checker")
+var relationCheckerObj = require("../js_checker/relation_checker")
     .relationChecker;
 
 // import free_libraries to populate the cache hash map.
-var free_libraries = require("script_entries/free_libraries");
+var free_libraries = require("../script_entries/free_libraries");
 
-var crypto = require('script_entries/crypto');
-const checkTypes = require("js_checker/constant_types").checkTypes;
+var crypto = require('./crypto');
+const checkTypes = require("../js_checker/constant_types").checkTypes;
 
 // cachedResults contains objects with result/relationChecker for
 // scripts entries indexed by SHA1sum
diff --git a/lib/settings/storage.js b/lib/settings/storage.js
index bc9fe77..38d231d 100644
--- a/lib/settings/storage.js
+++ b/lib/settings/storage.js
@@ -25,12 +25,16 @@ 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;
+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);
     },
 
diff --git a/lib/ui.js b/lib/ui.js
index e135f57..6e9058a 100644
--- a/lib/ui.js
+++ b/lib/ui.js
@@ -25,20 +25,22 @@ let tabs = require("sdk/tabs");
 let {getMostRecentBrowserWindow} = require('sdk/window/utils');
 let {ToggleButton} = require('sdk/ui/button/toggle');
 
-let settings_tab = require('settings/settings_tab');
-let allowedRef = require("http_observer/allowed_referrers").allowedReferrers;
-let urlHandler = require("url_handler/url_handler");
-let removedScripts = require("script_entries/removed_scripts").removedScripts;
-let acceptedScripts = require("script_entries/accepted_scripts")
+let settings_tab = require('./settings/settings_tab');
+let allowedRef = require("./http_observer/allowed_referrers")
+    .allowedReferrers;
+let urlHandler = require("./url_handler/url_handler");
+let removedScripts = require("./script_entries/removed_scripts")
+    .removedScripts;
+let acceptedScripts = require("./script_entries/accepted_scripts")
     .acceptedScripts;
-let jsLabelsPagesVisited = require('html_script_finder/web_labels/js_web_labels')
+let jsLabelsPagesVisited = require('./html_script_finder/web_labels/js_web_labels')
     .jsLabelsPagesVisited;
-let dryRunScripts = require("script_entries/dryrun_scripts").dryRunScripts;
-let types = require("js_checker/constant_types");
-const removeHashCallback = require("js_checker/js_checker").removeHashCallback;
+let dryRunScripts = require("./script_entries/dryrun_scripts").dryRunScripts;
+let types = require("./js_checker/constant_types");
+const removeHashCallback = require("./js_checker/js_checker").removeHashCallback;
 
 // move to sub-module later
-const scriptsCached = require("script_entries/scripts_cache").scriptsCached;
+const scriptsCached = require("./script_entries/scripts_cache").scriptsCached;
 
 function generateDataURI (encodedText) {
     return "data:text/html;charset=UTF-8;base64," + encodedText;