LibreJS updated to 6.0.9

3 files changed, 7 insertions, 10 deletions

diff --git a/data/extensions/jid1-KtlZuoiikVfFew@jetpack/resources/librejs/lib/script_entries/crypto.js b/data/extensions/jid1-KtlZuoiikVfFew@jetpack/resources/librejs/lib/script_entries/crypto.js
index 5fb920f..d8d9c0a 100644
--- a/data/extensions/jid1-KtlZuoiikVfFew@jetpack/resources/librejs/lib/script_entries/crypto.js
+++ b/data/extensions/jid1-KtlZuoiikVfFew@jetpack/resources/librejs/lib/script_entries/crypto.js
@@ -34,7 +34,6 @@ CryptoString.prototype.init = function(hashAlgorithm, charset) {
     this.converter.charset = charset;
     this.hashAlgorithm = hashAlgorithm;
     this.cryptoHash.init(this.cryptoHash[this.hashAlgorithm]);
-
 };
 
 CryptoString.prototype.encryptString = function(str) {
diff --git a/data/extensions/jid1-KtlZuoiikVfFew@jetpack/resources/librejs/lib/script_entries/free_libraries.js b/data/extensions/jid1-KtlZuoiikVfFew@jetpack/resources/librejs/lib/script_entries/free_libraries.js
index af2cf61..f3354f6 100644
--- a/data/extensions/jid1-KtlZuoiikVfFew@jetpack/resources/librejs/lib/script_entries/free_libraries.js
+++ b/data/extensions/jid1-KtlZuoiikVfFew@jetpack/resources/librejs/lib/script_entries/free_libraries.js
@@ -24,7 +24,7 @@
 
 var relationChecker = require("js_checker/relation_checker").relationChecker;
 var checkTypes = require("js_checker/constant_types").checkTypes;
-var scriptsCached = require("./scripts_cache").scriptsCached;
+var scriptsCached = require("script_entries/scripts_cache").scriptsCached;
 
 
 // find the json database path.
@@ -40,7 +40,6 @@ var freeLibraries = JSON.parse(dbContents); /* a database of the free libraries
  */
 
 var init = function () {
-
     // relationChecker, which roughly checks if variables are window
     //  variables or not, is useless in this case.  Use the same
     //  object for all entries.
diff --git a/data/extensions/jid1-KtlZuoiikVfFew@jetpack/resources/librejs/lib/script_entries/scripts_cache.js b/data/extensions/jid1-KtlZuoiikVfFew@jetpack/resources/librejs/lib/script_entries/scripts_cache.js
index 47ab069..dfc5e6a 100644
--- a/data/extensions/jid1-KtlZuoiikVfFew@jetpack/resources/librejs/lib/script_entries/scripts_cache.js
+++ b/data/extensions/jid1-KtlZuoiikVfFew@jetpack/resources/librejs/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 <http://www.gnu.org/licenses/>.
  */
-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
     };