backport

- Flush caches on upgrade
- Properly handle FrameModule's unloading
- Use the new module and remove the old implementation

1 files changed, 5 insertions, 3 deletions

diff --git a/js/storage.js b/js/storage.js
index b3a5e7b..012d2f2 100644
--- a/js/storage.js
+++ b/js/storage.js
@@ -21,10 +21,12 @@
     uMatrix Home: https://github.com/gorhill/uMatrix
 */
 
-/* global objectAssign, punycode, publicSuffixList */
+/* global objectAssign, publicSuffixList */
 
 'use strict';
 
+Components.utils.import('chrome://ematrix/content/lib/PublicSuffixList.jsm');
+
 /******************************************************************************/
 
 ηMatrix.getBytesInUse = function() {
@@ -264,7 +266,7 @@
             if ( entries.hasOwnProperty(assetKey) === false ) { continue; }
             entry = entries[assetKey];
             if ( entry.content !== 'filters' ) { continue; }
-            availableHostsFiles[assetKey] = objectAssign({}, entry);
+            availableHostsFiles[assetKey] = Object.assign({}, entry);
         }
 
         // Now get user's selection of lists
@@ -517,7 +519,7 @@
 
     var applyPublicSuffixList = function(details) {
         if ( !details.error ) {
-            publicSuffixList.parse(details.content, punycode.toASCII);
+            publicSuffixList.parse(details.content, Punycode.toASCII);
         }
         callback();
     };