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

Improve "Run JavaScript" dialog

Browse source
This commit is contained in:
Tom Najdek 2024-01-16 14:53:21 +01:00 committed by Dan Stillman
parent a54ed665bf
commit 2f9a12c2da
6 changed files with 128 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
chrome/content/zotero/ace/aceWrapper.js
View file

@ -1,26 +1,26 @@
/* /*
***** BEGIN LICENSE BLOCK ***** ***** BEGIN LICENSE BLOCK *****
Copyright © 2011 Center for History and New Media Copyright © 2011 Center for History and New Media
George Mason University, Fairfax, Virginia, USA George Mason University, Fairfax, Virginia, USA
http://zotero.org http://zotero.org
This file is part of Zotero. This file is part of Zotero.
Zotero is free software: you can redistribute it and/or modify Zotero is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by it under the terms of the GNU Affero General Public License as published by
the Free Software Foundation, either version 3 of the License, or the Free Software Foundation, either version 3 of the License, or
(at your option) any later version. (at your option) any later version.
Zotero is distributed in the hope that it will be useful, Zotero is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details. GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License You should have received a copy of the GNU Affero General Public License
along with Zotero. If not, see <http://www.gnu.org/licenses/>. along with Zotero. If not, see <http://www.gnu.org/licenses/>.
***** END LICENSE BLOCK ***** ***** END LICENSE BLOCK *****
*/ */
var editor, JavaScriptMode, TextMode, EditSession; var editor, JavaScriptMode, TextMode, EditSession;
@ -37,5 +37,9 @@ window.addEventListener("DOMContentLoaded", function(e) {
JavaScriptMode = require("ace/mode/javascript").Mode; JavaScriptMode = require("ace/mode/javascript").Mode;
TextMode = require("ace/mode/text").Mode; TextMode = require("ace/mode/text").Mode;
EditSession = require("ace/edit_session").EditSession; EditSession = require("ace/edit_session").EditSession;
editor = ace.edit('ace-div');
}, false); const isDark = Zotero.getMainWindow()?.matchMedia('(prefers-color-scheme: dark)').matches;
editor = ace.edit('ace-div', {
theme: isDark ? 'ace/theme/monokai' : 'ace/theme/chrome'
});
}, false);

4
chrome/content/zotero/runJS.html
View file

@ -1,7 +1,7 @@
<html> <html id="run-js">
<head> <head>
<title>Run JavaScript</title> <title>Run JavaScript</title>
<link href="chrome://zotero/skin/runJS.css" rel="stylesheet"/> <link href="chrome://zotero-platform/content/zotero.css" rel="stylesheet"/>
</head> </head>
<body> <body>
<nav> <nav>

10
chrome/content/zotero/runJS.js
View file

@ -93,9 +93,15 @@ window.addEventListener("load", function (e) {
// TODO: Enable if we modify to autocomplete from the Zotero API // TODO: Enable if we modify to autocomplete from the Zotero API
//enableLiveAutocompletion: true, //enableLiveAutocompletion: true,
highlightActiveLine: false, highlightActiveLine: false,
showGutter: false, showGutter: false
theme: "ace/theme/chrome",
}); });
codeEditor.on('input', handleInput); codeEditor.on('input', handleInput);
codeEditor.focus(); codeEditor.focus();
const isDarkMQL = Zotero.getMainWindow()?.matchMedia('(prefers-color-scheme: dark)');
isDarkMQL.addEventListener("change", (ev) => {
codeEditor.setOptions({
theme: ev.matches ? 'ace/theme/monokai' : 'ace/theme/chrome'
});
});
}, false); }, false);

81
chrome/skin/default/zotero/runJS.css
View file

@ -1,81 +0,0 @@
body {
font-family: Helvetica, sans-serif;
margin: 0;
height: 100%;
}
nav {
padding: 8px 5px 5px;
height: 25px;
}
button {
font-size: 15px;
}
#help-button {
margin-left: 15px;
}
#run-label {
margin-left: 2px;
font-size: 12px;
}
main {
display: flex;
justify-content: stretch;
height: calc(100% - 38px);
}
.textbox-container {
display: flex;
flex-direction: column;
align-items: stretch;
flex-grow: 1;
padding: 10px;
}
.textbox-header {
display: flex;
align-items: center;
justify-content: space-between;
line-height: 1.5;
}
.textbox-label {
font-size: 15px;
}
#run-as-async-label {
font-size: 13px;
}
label {
flex-grow: 0;
}
input[type=checkbox] {
margin-top: 0;
margin-bottom: 0;
}
iframe {
border: 1px solid gray;
}
iframe, textarea {
flex-grow: 1;
margin: 5px 0;
font-family: Monaco, Consolas, Inconsolata, monospace;
font-size: 12px;
resize: none;
}
textarea.error {
color: red;
}
.editor-code {
flex: 1;
}

3
scss/_zotero.scss
View file

@ -40,7 +40,8 @@
@import "components/notesList"; @import "components/notesList";
@import "components/progressMeter"; @import "components/progressMeter";
@import "components/publications-dialog"; @import "components/publications-dialog";
@import "components/rtfScan.scss"; @import "components/rtfScan";
@import "components/runJS";
@import "components/search"; @import "components/search";
@import "components/selectItemsDialog"; @import "components/selectItemsDialog";
@import "components/spinner"; @import "components/spinner";

88
scss/components/_runJS.scss Normal file
View file

@ -0,0 +1,88 @@
#run-js {
body {
font-size: 12px;
margin: 0;
height: 100%;
}
nav {
padding: 8px 5px 5px;
height: 25px;
}
button {
font-size: 15px;
}
#help-button {
margin-left: 15px;
}
#run-label {
margin-left: 2px;
font-size: 12px;
}
main {
display: flex;
justify-content: stretch;
height: calc(100% - 38px);
}
.textbox-container {
display: flex;
flex-direction: column;
align-items: stretch;
flex-grow: 1;
padding: 10px;
}
.textbox-header {
display: flex;
align-items: center;
justify-content: space-between;
line-height: 1.5;
}
.textbox-label {
font-size: 15px;
}
#run-as-async-label {
font-size: 13px;
}
label {
flex-grow: 0;
}
input[type=checkbox] {
margin-top: 0;
margin-bottom: 0;
}
iframe {
border: var(--material-panedivider);;
}
iframe,
textarea {
flex-grow: 1;
margin: 5px 0;
font-family: Monaco, Consolas, Inconsolata, monospace;
font-size: 12px;
resize: none;
}
textarea {
padding: 8px;
}
textarea.error {
color: var(--accent-red);
}
.editor-code {
flex: 1;
}
}