From 7228a1f02c983490fb0b5375eb6ebcb0938a63c3 Mon Sep 17 00:00:00 2001 From: Nik Nyby Date: Fri, 19 Jun 2015 19:01:44 -0400 Subject: more jpm compatibility --- lib/js_checker/js_checker.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'lib/js_checker/js_checker.js') 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; -- cgit v1.2.3 From 0f68d98dd281f1105043433da18fa9201b4cf971 Mon Sep 17 00:00:00 2001 From: Nik Nyby Date: Sat, 27 Jun 2015 10:07:42 -0400 Subject: Fixes for jpm --- lib/js_checker/js_checker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/js_checker/js_checker.js') diff --git a/lib/js_checker/js_checker.js b/lib/js_checker/js_checker.js index 4a3dfb9..ecf0826 100644 --- a/lib/js_checker/js_checker.js +++ b/lib/js_checker/js_checker.js @@ -173,7 +173,7 @@ JsChecker.prototype.searchJs = function(jsCode, resultReady, url) { this.resultReady = resultReady; this.jsCode = jsCode; this.shortText = jsCode.replace(bugfix, '').substring(0,100); - this.notification = require("ui/notification") + this.notification = require("../ui/notification") .createNotification(this.shortText).notification; var verbatimCode = this.jsCode.replace(bugfix, ''); -- cgit v1.2.3