From e5bd270b6b4692bad78561a4baf81c5d341f4790 Mon Sep 17 00:00:00 2001 From: Nik Nyby Date: Tue, 16 Jun 2015 19:56:11 -0400 Subject: Resolve circular dependency btw free_libraries and scripts_cached --- lib/script_entries/scripts_cache.js | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'lib/script_entries/scripts_cache.js') diff --git a/lib/script_entries/scripts_cache.js b/lib/script_entries/scripts_cache.js index 47ab069..dfc5e6a 100644 --- a/lib/script_entries/scripts_cache.js +++ b/lib/script_entries/scripts_cache.js @@ -19,11 +19,7 @@ * 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") - .relationChecker; - -// import free_libraries to populate the cache hash map. -var free_libraries = require("script_entries/free_libraries"); +var relationChecker = require("js_checker/relation_checker").relationChecker; var crypto = require('script_entries/crypto'); const checkTypes = require("js_checker/constant_types").checkTypes; @@ -52,6 +48,8 @@ ScriptsCached.prototype.getHash = function(scriptText) { */ ScriptsCached.prototype.resetCache = function () { cachedResults = {}; + // import free_libraries to populate the cache hash map. + var free_libraries = require("script_entries/free_libraries"); free_libraries.init(); }; @@ -64,11 +62,12 @@ ScriptsCached.prototype.resetCache = function () { * */ ScriptsCached.prototype.addEntry = function( - scriptText, result, relationChecker, allowTrivial, url) { + scriptText, result, relationCheckerObj, allowTrivial, url +) { console.debug("result addEntry is", JSON.stringify(result)); cachedResults[this.getHash(scriptText)] = { 'result': result, - 'relationChecker': relationCheckerObj(), + 'relationChecker': relationChecker(), 'allowTrivial': allowTrivial, 'url': url }; -- cgit v1.2.3