alex/yomichan
1
Fork 0
Code Releases Activity

Simplify float initialization

Browse Source
This commit is contained in:
toasted-nutbread 2019-10-02 21:11:06 -04:00
parent 7380ada1f1
commit fa7ee468c0
2 changed files with 28 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
ext/fg/js/float.js
View File

@ -96,6 +96,18 @@ class DisplayFloat extends Display {
}
}
initialize(options, popupInfo, url) {
const css = options.general.customPopupCss;
if (css) {
this.setStyle(css);
}
const {id, depth, parentFrameId} = popupInfo;
this.optionsContext.depth = depth;
this.optionsContext.url = url;
popupNestedInitialize(id, depth, parentFrameId, url);
}
setStyle(css) {
const parent = document.head;
@ -122,34 +134,11 @@ DisplayFloat.onKeyDownHandlers = {
};
DisplayFloat.messageHandlers = {
termsShow: (self, {definitions, options, context}) => {
self.termsShow(definitions, options, context);
},
kanjiShow: (self, {definitions, options, context}) => {
self.kanjiShow(definitions, options, context);
},
clearAutoPlayTimer: (self) => {
self.clearAutoPlayTimer();
},
orphaned: (self) => {
self.onOrphaned();
},
setOptions: (self, options) => {
const css = options.general.customPopupCss;
if (css) {
self.setStyle(css);
}
},
popupNestedInitialize: (self, {id, depth, parentFrameId, url}) => {
self.optionsContext.depth = depth;
self.optionsContext.url = url;
popupNestedInitialize(id, depth, parentFrameId, url);
}
termsShow: (self, {definitions, options, context}) => self.termsShow(definitions, options, context),
kanjiShow: (self, {definitions, options, context}) => self.kanjiShow(definitions, options, context),
clearAutoPlayTimer: (self) => self.clearAutoPlayTimer(),
orphaned: (self) => self.onOrphaned(),
initialize: (self, {options, popupInfo, url}) => self.initialize(options, popupInfo, url)
};
window.yomichan_display = new DisplayFloat();

20
ext/fg/js/popup.js
View File

@ -56,17 +56,19 @@ class Popup {
return new Promise((resolve) => {
const parentFrameId = (typeof this.frameId === 'number' ? this.frameId : null);
this.container.addEventListener('load', () => {
this.invokeApi('popupNestedInitialize', {
id: this.id,
depth: this.depth,
parentFrameId,
this.invokeApi('initialize', {
options: {
general: {
customPopupCss: options.general.customPopupCss
}
},
popupInfo: {
id: this.id,
depth: this.depth,
parentFrameId
},
url: this.url
});
this.invokeApi('setOptions', {
general: {
customPopupCss: options.general.customPopupCss
}
});
resolve();
});
this.observeFullscreen();