From 288df6a7bf8b933e2dc499e38f4915fcf974c14b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs?= <heckyel@hyperbola.info>
Date: Mon, 30 Dec 2019 15:55:13 -0500
Subject: backport

- Flush caches on upgrade
- Properly handle FrameModule's unloading
- Use the new module and remove the old implementation
---
 js/vapi-core.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'js/vapi-core.js')

diff --git a/js/vapi-core.js b/js/vapi-core.js
index 94ae599..fe80d7c 100644
--- a/js/vapi-core.js
+++ b/js/vapi-core.js
@@ -111,12 +111,9 @@
         // }
 
         // frameModule needs to be cleared too
-        let frameModuleURL = vAPI.getURL('frameModule.js');
-        let frameModule = {};
-
-        Cu.import(frameModuleURL, frameModule);
-        frameModule.contentObserver.unregister();
-        Cu.unload(frameModuleURL);
+        Cu.import('chrome://ematrix/content/lib/FrameModule.jsm');
+        contentObserver.unregister();
+        Cu.unload('chrome://ematrix/content/lib/FrameModule.jsm');
     });
 
     vAPI.noTabId = '-1';
-- 
cgit v1.2.3