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/httpsb.js b/js/httpsb.js
index b235f70..824a302 100644
--- a/js/httpsb.js
+++ b/js/httpsb.js
@@ -28,6 +28,8 @@
 /******************************************************************************/
 
 (function() {
+    Cu.import('chrome://ematrix/content/lib/UriTools.jsm');
+
     var ηm = ηMatrix;
     ηm.pMatrix = new ηm.Matrix();
     ηm.pMatrix.setSwitch('matrix-off', 'about-scheme', 1);
@@ -59,7 +61,7 @@
 /******************************************************************************/
 
 ηMatrix.hostnameFromURL = function(url) {
-    var hn = this.URI.hostnameFromURI(url);
+    var hn = UriTools.hostnameFromURI(url);
     return hn === '' ? '*' : hn;
 };
 
@@ -68,7 +70,7 @@
 /******************************************************************************/
 
 ηMatrix.evaluateURL = function(srcURL, desHostname, type) {
-    var srcHostname = this.URI.hostnameFromURI(srcURL);
+    var srcHostname = UriTools.hostnameFromURI(srcURL);
     return this.tMatrix.evaluateCellZXY(srcHostname, desHostname, type);
 };
 
@@ -93,7 +95,7 @@
 // done only from within a scope.
 
 ηMatrix.autoWhitelistAllTemporarily = function(pageURL) {
-    var srcHostname = this.URI.hostnameFromURI(pageURL);
+    var srcHostname = UriTools.hostnameFromURI(pageURL);
     if ( this.mustBlock(srcHostname, '*', '*') === false ) {
         return false;
     }