corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1463663 - Prefix exported functions of the RemotePageManager with RPM. r=mossop

Browse Source
This commit is contained in:
Christoph Kerschbaumer
2018-06-27 09:08:32 +02:00
parent 7a2d9b4eb5
commit 5afd502bd2
12 changed files with 87 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
browser/extensions/activity-stream/content-src/lib/snippets.js
View File

@@ -74,10 +74,10 @@ export class SnippetsMap extends Map {
getTotalBookmarksCount() {
return new Promise(resolve => {
this._dispatch(ac.OnlyToMain({type: at.TOTAL_BOOKMARKS_REQUEST}));
global.addMessageListener("ActivityStream:MainToContent", function onMessage({data: action}) {
global.RPMAddMessageListener("ActivityStream:MainToContent", function onMessage({data: action}) {
if (action.type === at.TOTAL_BOOKMARKS_RESPONSE) {
resolve(action.data);
global.removeMessageListener("ActivityStream:MainToContent", onMessage);
global.RPMRemoveMessageListener("ActivityStream:MainToContent", onMessage);
}
});
});
@@ -86,10 +86,10 @@ export class SnippetsMap extends Map {
getAddonsInfo() {
return new Promise(resolve => {
this._dispatch(ac.OnlyToMain({type: at.ADDONS_INFO_REQUEST}));
global.addMessageListener("ActivityStream:MainToContent", function onMessage({data: action}) {
global.RPMAddMessageListener("ActivityStream:MainToContent", function onMessage({data: action}) {
if (action.type === at.ADDONS_INFO_RESPONSE) {
resolve(action.data);
global.removeMessageListener("ActivityStream:MainToContent", onMessage);
global.RPMRemoveMessageListener("ActivityStream:MainToContent", onMessage);
}
});
});
@@ -318,8 +318,8 @@ export class SnippetsProvider {
}, options);
// Add listener so we know when snippets are blocked on other pages
if (global.addMessageListener) {
global.addMessageListener("ActivityStream:MainToContent", this._onAction);
if (global.RPMAddMessageListener) {
global.RPMAddMessageListener("ActivityStream:MainToContent", this._onAction);
}
// TODO: Requires enabling indexedDB on newtab
@@ -360,8 +360,8 @@ export class SnippetsProvider {
uninit() {
window.dispatchEvent(new Event(SNIPPETS_DISABLED_EVENT));
this._forceOnboardingVisibility(false);
if (global.removeMessageListener) {
global.removeMessageListener("ActivityStream:MainToContent", this._onAction);
if (global.RPMRemoveMessageListener) {
global.RPMRemoveMessageListener("ActivityStream:MainToContent", this._onAction);
}
this.initialized = false;
}