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

fx-compat: Fix PDF reader window

Browse source
This commit is contained in:
Martynas Bagdonas 2022-06-08 16:19:06 +03:00
parent 08089d6120
commit a7bc25b553
2 changed files with 88 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

115
chrome/content/zotero/reader.xul → chrome/content/zotero/reader.xhtml
View file

@ -4,31 +4,42 @@
<?xml-stylesheet href="chrome://zotero/skin/zotero.css" type="text/css"?> <?xml-stylesheet href="chrome://zotero/skin/zotero.css" type="text/css"?>
<?xml-stylesheet href="chrome://zotero/skin/overlay.css" type="text/css"?> <?xml-stylesheet href="chrome://zotero/skin/overlay.css" type="text/css"?>
<?xul-overlay href="chrome://zotero/content/standalone/editMenuOverlay.xul"?>
<?xul-overlay href="chrome://zotero-platform/content/standalone/menuOverlay.xul"?>
<!DOCTYPE window [ <!DOCTYPE window [
<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd"> %globalDTD; <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd"> %globalDTD;
<!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone.dtd" > %standaloneDTD; <!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone.dtd" > %standaloneDTD;
<!ENTITY % zoteroDTD SYSTEM "chrome://zotero/locale/zotero.dtd"> %zoteroDTD; <!ENTITY % zoteroDTD SYSTEM "chrome://zotero/locale/zotero.dtd"> %zoteroDTD;
]> ]>
<window <window
id="pdf-reader" id="pdf-reader"
windowtype="zotero:reader" windowtype="zotero:reader"
orient="vertical" orient="vertical"
width="1300" width="1300"
height="800" height="800"
persist="screenX screenY width height" persist="screenX screenY width height"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
> >
<html:link rel="localization" href="zotero/menubar.ftl"/>
<html:link rel="localization" href="zotero/textActions.ftl"/>
<script type="application/javascript"> <script type="application/javascript">
Components.utils.import('resource://gre/modules/Services.jsm'); var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
Services.scriptloader.loadSubScript("chrome://zotero/content/include.js", this);
Services.scriptloader.loadSubScript("resource://zotero/require.js", this);
// Mozilla scripts
Services.scriptloader.loadSubScript("chrome://global/content/globalOverlay.js", this);
Services.scriptloader.loadSubScript("chrome://global/content/editMenuOverlay.js", this);
Services.scriptloader.loadSubScript("chrome://global/content/contentAreaUtils.js", this);
if (Zotero.isMac) {
Services.scriptloader.loadSubScript("chrome://global/content/macWindowMenu.js", this);
}
Services.scriptloader.loadSubScript("chrome://zotero/content/elements/shadowAutocompleteInput.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/elements/tagsBox.js", this);
</script> </script>
<script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
<script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
<script type="application/javascript" src="chrome://global/content/inlineSpellCheckUI.js"/>
<script src="include.js"/>
<commandset id="mainCommandSet"> <commandset id="mainCommandSet">
<!--FILE--> <!--FILE-->
<command id="cmd_quitApplication" oncommand="goQuitApplication(event);"/> <command id="cmd_quitApplication" oncommand="goQuitApplication(event);"/>
@ -38,15 +49,27 @@
<commandset id="editMenuCommands"/> <commandset id="editMenuCommands"/>
<command id="cmd_find" <command id="cmd_find"
oncommand="document.getElementById('zotero-tb-search').select()"/> oncommand="document.getElementById('zotero-tb-search').select()"/>
<!--WINDOW-->
<command id="minimizeWindow"
label="&minimizeWindow.label;"
oncommand="window.minimize();" />
<command id="zoomWindow"
label="&zoomWindow.label;"
oncommand="zoomWindow();" />
</commandset> </commandset>
<keyset id="mainKeyset"> <keyset id="mainKeyset">
<key id="key_back"/> <key id="key_back"/>
<key id="key_forward"/> <key id="key_forward"/>
<key id="key_minimizeWindow"
command="minimizeWindow"
key="&minimizeWindow.key;"
modifiers="accel"/>
</keyset> </keyset>
<!-- TODO: Localize --> <!-- TODO: Localize -->
<tooltip id="iframeTooltip" onpopupshowing="if (tooltipTitleNode = document.tooltipNode.closest('*[title]')) {this.setAttribute('label', tooltipTitleNode.getAttribute('title')); return true; } return false"/> <tooltip id="iframeTooltip" page="true"/>
<menubar> <menubar>
<menu id="fileMenu" label="&fileMenu.label;" accesskey="&fileMenu.accesskey;"> <menu id="fileMenu" label="&fileMenu.label;" accesskey="&fileMenu.accesskey;">
<menupopup id="menu_FilePopup"> <menupopup id="menu_FilePopup">
@ -60,15 +83,31 @@
</menupopup> </menupopup>
</menu> </menu>
<menu id="menu_edit"> <menu id="edit-menu" data-l10n-id="menu-edit">
<menupopup id="menu_EditPopup"> <menupopup id="menu_EditPopup">
<menuitem id="menu_undo"/> <menuitem id="menu_undo"
<menuitem id="menu_redo"/> key="key_undo"
command="cmd_undo" data-l10n-id="text-action-undo"/>
<menuitem id="menu_redo"
key="key_redo"
command="cmd_redo" data-l10n-id="text-action-redo"/>
<menuseparator/> <menuseparator/>
<menuitem id="menu_cut"/> <menuitem id="menu_cut"
<menuitem id="menu_copy"/> key="key_cut"
<menuitem id="menu_paste"/> command="cmd_cut" data-l10n-id="text-action-cut"/>
<menuitem id="menu_delete"/> <menuitem id="menu_copy"
key="key_copy"
command="cmd_copy" data-l10n-id="text-action-copy"/>
<menuitem id="menu_paste"
key="key_paste"
command="cmd_paste" data-l10n-id="text-action-paste"/>
<menuitem id="menu_delete"
key="key_delete"
command="cmd_delete" data-l10n-id="text-action-delete"/>
<menuseparator/>
<menuitem id="menu_selectAll"
key="key_selectAll"
command="cmd_selectAll" data-l10n-id="text-action-select-all"/>
</menupopup> </menupopup>
</menu> </menu>
<menu label="View" onpopupshowing="onViewMenuOpen()"> <menu label="View" onpopupshowing="onViewMenuOpen()">
@ -201,9 +240,29 @@
</menu> </menu>
<menu id="windowMenu" <menu id="windowMenu"
label="&windowMenu.label;" label="&windowMenu.label;"
datasources="rdf:window-mediator" ref="NC:WindowMediatorRoot"
onpopupshowing="macWindowMenuDidShow();" onpopupshowing="macWindowMenuDidShow();"
onpopuphidden="macWindowMenuDidHide();" onpopuphidden="macWindowMenuDidHide();"
> hidden="false">
<template>
<rule>
<menupopup>
<menuitem uri="rdf:*"
label="rdf:http://home.netscape.com/NC-rdf#Name"
type="radio"
name="windowList"
oncommand="ShowWindowFromResource(event.target)"/>
</menupopup>
</rule>
</template>
<menupopup id="windowPopup">
<menuitem command="minimizeWindow" label="&minimizeWindow.label;" key="key_minimizeWindow"/>
<menuitem command="zoomWindow" label="&zoomWindow.label;"/>
<!-- decomment when "BringAllToFront" is implemented
<menuseparator/>
<menuitem label="&bringAllToFront.label;" disabled="true"/> -->
<menuseparator id="sep-window-list"/>
</menupopup>
</menu> </menu>
</menubar> </menubar>

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

@ -1040,7 +1040,7 @@ class ReaderWindow extends ReaderInstance {
if (!win) return; if (!win) return;
this._window = win.open( this._window = win.open(
'chrome://zotero/content/reader.xul', '', 'chrome,resizable' 'chrome://zotero/content/reader.xhtml', '', 'chrome,resizable'
); );
this._window.addEventListener('DOMContentLoaded', (event) => { this._window.addEventListener('DOMContentLoaded', (event) => {