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

fx-compat: Switch to Mozilla's method of loading window scripts

Browse source
This commit is contained in:
Dan Stillman 2022-05-12 06:09:17 -04:00
parent 9b3d7a32e3
commit d6875e1182
2 changed files with 34 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
chrome/content/zotero/standalone/standalone.js
View file

@ -43,10 +43,6 @@ const ZoteroStandalone = new function() {
}
if (Zotero.isMac) {
let elem = document.createElementNS('http://www.w3.org/1999/xhtml', 'script');
elem.src = 'chrome://global/content/macWindowMenu.js';
document.documentElement.appendChild(elem);
// Create tab bar by default
document.documentElement.setAttribute('drawintitlebar', true);
document.documentElement.setAttribute('tabsintitlebar', true);

53
chrome/content/zotero/zoteroPane.xhtml
View file

@ -53,35 +53,44 @@
persist="screenX screenY width height sizemode"
xmlns:html="http://www.w3.org/1999/xhtml">
<html:script src="include.js"></html:script>
<html:link rel="localization" href="zotero/menubar.ftl"/>
<html:link rel="localization" href="zotero/textActions.ftl"/>
<html:script src="resource://zotero/require.js"></html:script>
<html:script src="standalone/standalone.js"></html:script>
<script>
var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
<html:script src="chrome://global/content/globalOverlay.js"></html:script>
<html:script src="chrome://global/content/editMenuOverlay.js"></html:script>
<html:script src="chrome://global/content/contentAreaUtils.js"></html:script>
Services.scriptloader.loadSubScript("chrome://zotero/content/include.js", this);
<!-- Custom elements -->
<html:script src="chrome://global/content/customElements.js"></html:script>
<html:script src="elements/menulistItemTypes.js"></html:script>
<html:script src="elements/itemBox.js"></html:script>
Services.scriptloader.loadSubScript("resource://zotero/require.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/standalone/standalone.js", this);
<html:script src="tabs.js"></html:script>
<html:script src="zoteroPane.js"></html:script>
<html:script src="itemPane.js"></html:script>
<html:script src="contextPane.js"></html:script>
<html:script src="fileInterface.js"></html:script>
<html:script src="reportInterface.js"></html:script>
<html:script src="timelineInterface.js"></html:script>
<html:script src="progressQueueDialog.js"></html:script>
<html:script src="lookup.js"></html:script>
<html:script src="locateMenu.js"></html:script>
<html:script src="tooltip.js"></html:script>
<html:script src="containers/tagSelectorContainer.js"></html:script>
// 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);
}
// Custom elements
Services.scriptloader.loadSubScript("chrome://global/content/customElements.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/elements/menulistItemTypes.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/elements/itemBox.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/tabs.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/zoteroPane.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/itemPane.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/contextPane.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/fileInterface.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/reportInterface.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/timelineInterface.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/progressQueueDialog.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/lookup.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/locateMenu.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/tooltip.js", this);
Services.scriptloader.loadSubScript("chrome://zotero/content/containers/tagSelectorContainer.js", this);
</script>
<commandset id="mainCommandSet">
<!--FILE-->