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/script_entries/free_libraries.js | 7 ++++--- lib/script_entries/scripts_cache.js | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'lib/script_entries') 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 . */ -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 -- cgit v1.2.3 From a7f7dba18dc59d5807512ddc1c0206a279c7dab2 Mon Sep 17 00:00:00 2001 From: Nik Nyby Date: Fri, 19 Jun 2015 19:12:18 -0400 Subject: more jpm compat --- lib/script_entries/accepted_scripts.js | 2 +- lib/script_entries/all_scripts.js | 2 +- lib/script_entries/dryrun_scripts.js | 4 ++-- lib/script_entries/free_libraries.js | 3 ++- lib/script_entries/removed_scripts.js | 4 ++-- 5 files changed, 8 insertions(+), 7 deletions(-) (limited to 'lib/script_entries') diff --git a/lib/script_entries/accepted_scripts.js b/lib/script_entries/accepted_scripts.js index c732f31..bac11f0 100644 --- a/lib/script_entries/accepted_scripts.js +++ b/lib/script_entries/accepted_scripts.js @@ -20,7 +20,7 @@ * along with GNU LibreJS. If not, see . */ -var allScripts = require('script_entries/all_scripts').allScripts; +var allScripts = require('./all_scripts').allScripts; var AcceptedScripts = function() { this.scripts = {}; diff --git a/lib/script_entries/all_scripts.js b/lib/script_entries/all_scripts.js index 2028864..c27a410 100644 --- a/lib/script_entries/all_scripts.js +++ b/lib/script_entries/all_scripts.js @@ -20,7 +20,7 @@ * along with GNU LibreJS. If not, see . */ -var crypto = require('script_entries/crypto'); +var crypto = require('./crypto'); var AllScripts = function() { this.scripts = {}; diff --git a/lib/script_entries/dryrun_scripts.js b/lib/script_entries/dryrun_scripts.js index 87ec482..a15b0b2 100644 --- a/lib/script_entries/dryrun_scripts.js +++ b/lib/script_entries/dryrun_scripts.js @@ -20,8 +20,8 @@ * along with GNU LibreJS. If not, see . */ -var allScripts = require('script_entries/all_scripts').allScripts; -const urlHandler = require('url_handler/url_handler'); +var allScripts = require('./all_scripts').allScripts; +const urlHandler = require('../url_handler/url_handler'); exports.dryRunScripts = { scripts: {}, diff --git a/lib/script_entries/free_libraries.js b/lib/script_entries/free_libraries.js index e7b9a3f..ac1a664 100644 --- a/lib/script_entries/free_libraries.js +++ b/lib/script_entries/free_libraries.js @@ -29,7 +29,8 @@ var scriptsCached = require("./scripts_cache").scriptsCached; // find the json database path. -var dbContents = require("sdk/self").data.load("script_libraries/script-libraries.json"); +var dbContents = require("sdk/self").data.load( + "../script_libraries/script-libraries.json"); const AUTHOR_REASON = "This script has been tagged as free software by LibreJS authors."; diff --git a/lib/script_entries/removed_scripts.js b/lib/script_entries/removed_scripts.js index b7544e9..2a3b1d3 100644 --- a/lib/script_entries/removed_scripts.js +++ b/lib/script_entries/removed_scripts.js @@ -20,8 +20,8 @@ * along with GNU LibreJS. If not, see . */ -var allScripts = require('script_entries/all_scripts').allScripts; -const urlHandler = require('url_handler/url_handler'); +var allScripts = require('./all_scripts').allScripts; +const urlHandler = require('../url_handler/url_handler'); var RemovedScripts = function() { this.scripts = {}; -- cgit v1.2.3 From 9180aa0e94f4c043f2ef6103788d7fde0b927741 Mon Sep 17 00:00:00 2001 From: Nik Nyby Date: Fri, 19 Jun 2015 19:23:45 -0400 Subject: jpm compat --- lib/script_entries/free_libraries.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/script_entries') diff --git a/lib/script_entries/free_libraries.js b/lib/script_entries/free_libraries.js index ac1a664..291b982 100644 --- a/lib/script_entries/free_libraries.js +++ b/lib/script_entries/free_libraries.js @@ -30,7 +30,7 @@ var scriptsCached = require("./scripts_cache").scriptsCached; // find the json database path. var dbContents = require("sdk/self").data.load( - "../script_libraries/script-libraries.json"); + "script_libraries/script-libraries.json"); const AUTHOR_REASON = "This script has been tagged as free software by LibreJS authors."; -- 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/script_entries/scripts_cache.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/script_entries') diff --git a/lib/script_entries/scripts_cache.js b/lib/script_entries/scripts_cache.js index a09f94e..52ae33f 100644 --- a/lib/script_entries/scripts_cache.js +++ b/lib/script_entries/scripts_cache.js @@ -40,7 +40,8 @@ var ScriptsCached = function() { }; ScriptsCached.prototype.getHash = function(scriptText) { - require('ui/notification').createNotification(scriptText.substring(0,100)); + require('../ui/notification').createNotification( + scriptText.substring(0,100)); return crypto.sha1Encrypt(scriptText); }; -- cgit v1.2.3