more jpm compatibility

4 files changed, 18 insertions, 22 deletions

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;