refactor: remove unnecessary arrow function wrap

- add installed handler
This commit is contained in:
DecentM 2018-02-03 23:17:24 +01:00
parent 90399c53a8
commit 6853158790
No known key found for this signature in database
GPG Key ID: 6BDA2D2BC5EA5B10

View File

@ -30,30 +30,32 @@
}); });
}; };
const attachInstalledListeners = () => { const installedHandler = event => {
window.addEventListener('message', event => { if (
if ( event.data
event.data && event.data.type === 'ouc-is-installed'
&& event.data.type === 'ouc-is-installed' && allowedOrigins.includes(event.origin)
&& allowedOrigins.includes(event.origin) ) {
) { chrome.runtime.sendMessage({
chrome.runtime.sendMessage({ method: 'findUsercss',
method: 'findUsercss', name: event.data.name,
name: event.data.name, namespace: event.data.namespace
namespace: event.data.namespace }, style => {
}, style => { const data = {event};
const data = {event}; const callbackObject = {
const callbackObject = { installed: Boolean(style),
installed: Boolean(style), enabled: style.enabled,
enabled: style.enabled, name: data.name,
name: data.name, namespace: data.namespace
namespace: data.namespace };
};
sendInstalledCallback(callbackObject); sendInstalledCallback(callbackObject);
}); });
} }
}); };
const attachInstalledListeners = () => {
window.addEventListener('message', installedHandler);
}; };
const doHandshake = () => { const doHandshake = () => {
@ -102,17 +104,19 @@
}); });
}; };
const handshakeHandler = event => {
if (
event.data
&& event.data.type === 'ouc-handshake-question'
&& allowedOrigins.includes(event.origin)
) {
doHandshake();
}
};
const attachHandshakeListeners = () => { const attachHandshakeListeners = () => {
// Wait for the handshake request, then start it // Wait for the handshake request, then start it
window.addEventListener('message', event => { window.addEventListener('message', handshakeHandler);
if (
event.data
&& event.data.type === 'ouc-handshake-question'
&& allowedOrigins.includes(event.origin)
) {
doHandshake();
}
});
}; };
const sendInstallCallback = data => { const sendInstallCallback = data => {
@ -124,33 +128,37 @@
}); });
}; };
const attachInstallListeners = () => { const installHandler = event => {
// Wait for an install event, then save the theme if (
window.addEventListener('message', event => { event.data
if ( && event.data.type === 'ouc-install-usercss'
event.data && allowedOrigins.includes(event.origin)
&& event.data.type === 'ouc-install-usercss' ) {
&& allowedOrigins.includes(event.origin) chrome.runtime.sendMessage({
) { method: 'saveUsercss',
chrome.runtime.sendMessage({ reason: 'install',
method: 'saveUsercss', name: event.data.title,
reason: 'install', sourceCode: event.data.code,
name: event.data.title, }, response => {
sourceCode: event.data.code, sendInstallCallback({
}, response => { enabled: response.enabled,
sendInstallCallback({ key: event.data.key
enabled: response.enabled,
key: event.data.key
});
}); });
} });
}); }
}; };
(() => { const attachInstallListeners = () => {
attachHandshakeListeners(); // Wait for an install event, then save the theme
attachInstallListeners(); window.addEventListener('message', installHandler);
attachInstalledListeners(); };
askHandshake();
})(); window.removeEventListener('message', installHandler);
window.removeEventListener('message', handshakeHandler);
window.removeEventListener('message', installedHandler);
attachHandshakeListeners();
attachInstallListeners();
attachInstalledListeners();
askHandshake();
})(); })();