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

fx-compat: Start to fix tag color chooser dialog

Browse source 
Among other things, need to recreate XBL <customcolorpicker> as a Custom
Element and need to change `ondialogaccept`/etc. to event listeners:

https://searchfox.org/mozilla-central/rev/b72e9d7d63bf499d1d8168291b93d4ec7fde236e/browser/components/places/content/bookmarkProperties.js#232-237
This commit is contained in:
Dan Stillman 2022-05-12 05:14:05 -04:00
parent 63634eed02
commit bc68b6e9fe
4 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chrome/content/zotero/containers/tagSelectorContainer.jsx
View file

@ -620,7 +620,7 @@ Zotero.TagSelector = class TagSelectorContainer extends React.PureComponent {
io.tagColors = tagColors; io.tagColors = tagColors;
window.openDialog( window.openDialog(
'chrome://zotero/content/tagColorChooser.xul', 'chrome://zotero/content/tagColorChooser.xhtml',
'zotero-tagSelector-colorChooser', 'zotero-tagSelector-colorChooser',
'chrome,modal,centerscreen', io 'chrome,modal,centerscreen', io
); );

2
chrome/content/zotero/tagColorChooser.js
View file

@ -29,7 +29,7 @@ var Zotero_Tag_Color_Chooser = new function() {
var _io; var _io;
this.init = function () { this.init = function () {
var dialog = document.getElementById('tag-color-chooser'); var dialog = document.querySelector('dialog');
try { try {
// Set font size from pref // Set font size from pref

17
chrome/content/zotero/tagColorChooser.xul → chrome/content/zotero/tagColorChooser.xhtml
View file

@ -28,17 +28,21 @@
<?xml-stylesheet href="chrome://zotero/skin/tagColorChooser.css" type="text/css"?> <?xml-stylesheet href="chrome://zotero/skin/tagColorChooser.css" type="text/css"?>
<!DOCTYPE window SYSTEM "chrome://zotero/locale/zotero.dtd"> <!DOCTYPE window SYSTEM "chrome://zotero/locale/zotero.dtd">
<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" <window
title="&zotero.tagColorChooser.title;" buttons="cancel,accept" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
id="tag-color-chooser" xmlns:html="http://www.w3.org/1999/xhtml"
title="&zotero.tagColorChooser.title;"
onload="Zotero_Tag_Color_Chooser.init()"
width="350"
height="140">
<dialog
buttons="cancel,accept"
buttonlabelaccept="&zotero.tagColorChooser.setColor;" buttonlabelaccept="&zotero.tagColorChooser.setColor;"
buttonlabelextra1="&zotero.tagColorChooser.removeColor;" buttonlabelextra1="&zotero.tagColorChooser.removeColor;"
ondialogaccept="Zotero_Tag_Color_Chooser.onDialogAccept()" ondialogaccept="Zotero_Tag_Color_Chooser.onDialogAccept()"
ondialogcancel="Zotero_Tag_Color_Chooser.onDialogCancel()" ondialogcancel="Zotero_Tag_Color_Chooser.onDialogCancel()"
ondialogextra1="Zotero_Tag_Color_Chooser.onDialogRemoveColor()" ondialogextra1="Zotero_Tag_Color_Chooser.onDialogRemoveColor()"
onload="Zotero_Tag_Color_Chooser.init()" >
width="350"
height="140">
<script src="include.js"/> <script src="include.js"/>
<script src="tagColorChooser.js"/> <script src="tagColorChooser.js"/>
@ -61,3 +65,4 @@
<separator class="thin"/> <separator class="thin"/>
</vbox> </vbox>
</dialog> </dialog>
</window>

2
test/tests/tagSelectorTest.js
View file

@ -714,7 +714,7 @@ describe("Tag Selector", function () {
assert.include(getRegularTags(), "a"); assert.include(getRegularTags(), "a");
var dialogPromise = waitForDialog(false, undefined, 'chrome://zotero/content/tagColorChooser.xul'); var dialogPromise = waitForDialog(false, undefined, 'chrome://zotero/content/tagColorChooser.xhtml');
var tagSelectorPromise = waitForTagSelector(win); var tagSelectorPromise = waitForTagSelector(win);
tagSelector.contextTag = {name: tag}; tagSelector.contextTag = {name: tag};
yield tagSelector.openColorPickerWindow(); yield tagSelector.openColorPickerWindow();