Revert "Resolve circular dependency btw free_libraries and scripts_cached"

This reverts commit e5bd270b6b4692bad78561a4baf81c5d341f4790.

1 files changed, 7 insertions, 6 deletions

diff --git a/lib/script_entries/scripts_cache.js b/lib/script_entries/scripts_cache.js
index dfc5e6a..47ab069 100644
--- a/lib/script_entries/scripts_cache.js
+++ b/lib/script_entries/scripts_cache.js
@@ -19,7 +19,11 @@
  * 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 relationChecker = require("js_checker/relation_checker").relationChecker;
+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 crypto = require('script_entries/crypto');
 const checkTypes = require("js_checker/constant_types").checkTypes;
@@ -48,8 +52,6 @@ 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();
 };
   
@@ -62,12 +64,11 @@ ScriptsCached.prototype.resetCache = function () {
  * 
  */
 ScriptsCached.prototype.addEntry = function(
-    scriptText, result, relationCheckerObj, allowTrivial, url
-) {
+        scriptText, result, relationChecker, allowTrivial, url) {
     console.debug("result addEntry is", JSON.stringify(result));
     cachedResults[this.getHash(scriptText)] = {
         'result': result,
-        'relationChecker': relationChecker(),
+        'relationChecker': relationCheckerObj(),
         'allowTrivial': allowTrivial,
         'url': url
     };