This commit is contained in:
Alex Yatskov 2016-04-05 22:18:55 -07:00
parent 8774c783f6
commit 721a4dc661
4 changed files with 49 additions and 14 deletions

View File

@ -27,11 +27,16 @@ function formToOptions() {
}); });
} }
$(document).ready(() => loadOptions((opts) => optionsToForm(opts))); $('#saveOptions').click(() => {
const opt = formToOptions();
const yomichan = chrome.extension.getBackgroundPage().yomichan;
saveOptions(() => yomichan.updateOptions(opts));
});
$('#saveOptions').click(() => saveOptions(formToOptions()));
$('#resetOptions').click(() => { $('#resetOptions').click(() => {
if (confirm('Reset options to defaults?')) { if (confirm('Reset options to default values?')) {
optionsToForm(sanitizeOptions({})); optionsToForm(sanitizeOptions({}));
} }
}); });
$(document).ready(() => loadOptions((opts) => optionsToForm(opts)));

View File

@ -23,6 +23,9 @@ function sanitizeOptions(options) {
}; };
for (const key in defaults) { for (const key in defaults) {
if (!options.hasOwnProperty(key)) {
options[key] = defaults[key];
}
options[key] = options[key] || defaults[key]; options[key] = options[key] || defaults[key];
} }

View File

@ -23,9 +23,12 @@ class Yomichan {
this.translator = new Translator(); this.translator = new Translator();
this.updateState('disabled'); this.updateState('disabled');
this.updateOptions({});
chrome.runtime.onMessage.addListener(this.onMessage.bind(this)); chrome.runtime.onMessage.addListener(this.onMessage.bind(this));
chrome.browserAction.onClicked.addListener(this.onBrowserAction.bind(this)); chrome.browserAction.onClicked.addListener(this.onBrowserAction.bind(this));
loadOptions((opts) => this.updateOptions(opts));
} }
onMessage(request, sender, callback) { onMessage(request, sender, callback) {
@ -37,11 +40,9 @@ class Yomichan {
renderTemplate: ({data, template}) => Handlebars.templates[template](data) renderTemplate: ({data, template}) => Handlebars.templates[template](data)
}[action]; }[action];
if (handler !== null) { const result = handler.call(this, data);
const result = handler.call(this, data); if (callback !== null) {
if (callback !== null) { callback(result);
callback(result);
}
} }
} }
@ -57,6 +58,10 @@ class Yomichan {
} }
updateState(state) { updateState(state) {
if (this.state === state) {
return;
}
this.state = state; this.state = state;
switch (state) { switch (state) {
@ -72,9 +77,18 @@ class Yomichan {
break; break;
} }
Yomichan.notifyChange('state', this.state);
}
updateOptions(options) {
this.options = sanitizeOptions(options);
Yomichan.notifyChange('options', this.options);
}
static notifyChange(name, value) {
chrome.tabs.query({}, (tabs) => { chrome.tabs.query({}, (tabs) => {
for (const tab of tabs) { for (const tab of tabs) {
chrome.tabs.sendMessage(tab.id, this.state, () => null); chrome.tabs.sendMessage(tab.id, {name: name, value: value}, () => null);
} }
}); });
} }

View File

@ -22,6 +22,7 @@ class Client {
this.popupOffset = 10; this.popupOffset = 10;
this.lastMosePos = null; this.lastMosePos = null;
this.enabled = false; this.enabled = false;
this.options = null;
this.popup = document.createElement('div'); this.popup = document.createElement('div');
this.popup.classList.add('yomichan-popup'); this.popup.classList.add('yomichan-popup');
@ -61,8 +62,16 @@ class Client {
} }
} }
onMessage(request, sender, callback) { onMessage({name, value}, sender, callback) {
this.setEnabled(request === 'enabled'); switch (name) {
case 'state':
this.setEnabled(value === 'enabled');
break;
case 'options':
this.setOptions(value);
break;
}
callback(); callback();
} }
@ -117,6 +126,10 @@ class Client {
this.hidePopup(); this.hidePopup();
} }
} }
setOptions(opts) {
this.options = opts;
}
} }
window.yomiClient = new Client(); window.yomiClient = new Client();