mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fx-compat: Fix color rendering in annotation popup, use checkbox

Browse source
This commit is contained in:
Martynas Bagdonas 2022-06-08 21:21:23 +03:00
parent 1e25e2ac4c
commit 1b324f9bd1
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
chrome/content/zotero/xpcom/reader.js
View file

@ -574,7 +574,8 @@ class ReaderInstance {
menuitem.setAttribute('label', Zotero.getString(color[0]));
menuitem.className = 'menuitem-iconic';
menuitem.setAttribute('disabled', data.readOnly);
menuitem.setAttribute('image', this._getColorIcon(color[1], color[1] === data.selectedColor));
menuitem.setAttribute('checked', color[1] === data.selectedColor);
menuitem.setAttribute('image', this._getColorIcon(color[1]));
menuitem.addEventListener('command', () => {
this._postMessage({
action: 'popupCmd',
@ -633,7 +634,7 @@ class ReaderInstance {
popup.appendChild(menuitem);
if (data.x) {
popup.openPopupAtScreen(data.x, data.y, true);
popup.openPopupAtScreen(data.x, data.y, false);
}
else if (data.selector) {
let element = this._iframeWindow.document.querySelector(data.selector);
@ -652,7 +653,8 @@ class ReaderInstance {
menuitem = this._window.document.createXULElement('menuitem');
menuitem.setAttribute('label', Zotero.getString(color[0]));
menuitem.className = 'menuitem-iconic';
menuitem.setAttribute('image', this._getColorIcon(color[1], color[1] === data.selectedColor));
menuitem.setAttribute('checked', color[1] === data.selectedColor);
menuitem.setAttribute('image', this._getColorIcon(color[1]));
menuitem.addEventListener('command', () => {
this._postMessage({
action: 'popupCmd',