oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-07-05 10:38:30 +00:00
Code Wiki Activity

4.0.0-rc12.7

Browse source 
* Fixed: The fix for metadata needed a fix.
This commit is contained in:
SirStendec 2018-08-07 21:37:21 -04:00
parent 9cded8480e
commit 321ba85e7a
2 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main.js
View file

@ -100,7 +100,7 @@ class FrankerFaceZ extends Module {
FrankerFaceZ.Logger = Logger; FrankerFaceZ.Logger = Logger;
const VER = FrankerFaceZ.version_info = { const VER = FrankerFaceZ.version_info = {
major: 4, minor: 0, revision: 0, extra: '-rc12.6', major: 4, minor: 0, revision: 0, extra: '-rc12.7',
commit: __git_commit__, commit: __git_commit__,
build: __webpack_hash__, build: __webpack_hash__,
toString: () => toString: () =>

22
src/modules/metadata.jsx
View file

@ -398,7 +398,23 @@ export default class Metadata extends Module {
if ( el._ffz_popup ) if ( el._ffz_popup )
return el._ffz_destroy(); return el._ffz_destroy();
const listeners = [],
add_close_listener = cb => listeners.push(cb);
const destroy = el._ffz_destroy = () => { const destroy = el._ffz_destroy = () => {
for(const cb of listeners) {
try {
cb();
} catch(err) {
this.log.capture(err, {
tags: {
metadata: key
}
});
this.log.error('Error when running a callback for pop-up destruction for metadata:', key, err);
}
}
if ( el._ffz_outside ) if ( el._ffz_outside )
el._ffz_outside.destroy(); el._ffz_outside.destroy();
@ -434,7 +450,7 @@ export default class Metadata extends Module {
} }
} }
}, },
content: (t, tip) => def.popup.call(this, el._ffz_data, tip, () => refresh_fn(key)), content: (t, tip) => def.popup.call(this, el._ffz_data, tip, () => refresh_fn(key), add_close_listener),
onShow: (t, tip) => onShow: (t, tip) =>
setTimeout(() => { setTimeout(() => {
el._ffz_outside = new ClickOutside(tip.outer, destroy); el._ffz_outside = new ClickOutside(tip.outer, destroy);
@ -690,7 +706,7 @@ export default class Metadata extends Module {
return el._ffz_destroy(); return el._ffz_destroy();
const listeners = [], const listeners = [],
add_listener = cb => listeners.push(cb); add_close_listener = cb => listeners.push(cb);
const destroy = el._ffz_destroy = () => { const destroy = el._ffz_destroy = () => {
for(const cb of listeners) { for(const cb of listeners) {
@ -741,7 +757,7 @@ export default class Metadata extends Module {
} }
} }
}, },
content: (t, tip) => def.popup.call(this, el._ffz_data, tip, () => refresh_fn(key), add_listener), content: (t, tip) => def.popup.call(this, el._ffz_data, tip, () => refresh_fn(key), add_close_listener),
onShow: (t, tip) => onShow: (t, tip) =>
setTimeout(() => { setTimeout(() => {
el._ffz_outside = new ClickOutside(tip.outer, destroy); el._ffz_outside = new ClickOutside(tip.outer, destroy);