backport

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

1 files changed, 3 insertions, 6 deletions

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';