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

Rename zotero-note-editor submodule to note-editor

Browse source
This commit is contained in:
Dan Stillman 2021-02-11 14:48:27 -05:00
parent 4c11d45679
commit e1c0f6c1a0
8 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitmodules vendored
View file

@ -37,7 +37,7 @@
path = pdf-worker path = pdf-worker
url = ssh://git@github.com/zotero/pdf-worker.git url = ssh://git@github.com/zotero/pdf-worker.git
branch = master branch = master
[submodule "zotero-note-editor"] [submodule "note-editor"]
path = zotero-note-editor path = note-editor
url = ssh://git@github.com/zotero/zotero-note-editor.git url = ssh://git@github.com/zotero/zotero-note-editor.git
branch = master branch = master

2
chrome/content/zotero/bindings/noteeditor.xml
View file

@ -333,7 +333,7 @@
<content> <content>
<xul:vbox xbl:inherits="flex" style="display: flex;flex-direction: column;flex-grow: 1;"> <xul:vbox xbl:inherits="flex" style="display: flex;flex-direction: column;flex-grow: 1;">
<xul:iframe tooltip="editor-tooltip" anonid="editor-view" flex="1" overflow="auto" style="width: 100%;margin-right: 5px;border: 0;width: 100%;margin-right: 5px;border: 0;flex-grow: 1;" <xul:iframe tooltip="editor-tooltip" anonid="editor-view" flex="1" overflow="auto" style="width: 100%;margin-right: 5px;border: 0;width: 100%;margin-right: 5px;border: 0;flex-grow: 1;"
frameBorder="0" src="resource://zotero/zotero-note-editor/editor.html" type="content"/> frameBorder="0" src="resource://zotero/note-editor/editor.html" type="content"/>
<xul:hbox id="links-container" hidden="true"> <xul:hbox id="links-container" hidden="true">
<xul:linksbox id="links-box" flex="1" xbl:inherits="notitle"/> <xul:linksbox id="links-box" flex="1" xbl:inherits="notitle"/>
</xul:hbox> </xul:hbox>

4
chrome/content/zotero/xpcom/editorInstance.js
View file

@ -23,9 +23,9 @@
***** END LICENSE BLOCK ***** ***** END LICENSE BLOCK *****
*/ */
// When changing this update in `zotero-note-editor` as well. // When changing this update in `note-editor` as well.
// This only filters images that are being imported from a URL. // This only filters images that are being imported from a URL.
// In all other cases `zotero-note-editor` should decide what // In all other cases `note-editor` should decide what
// image types can be imported, and if not then // image types can be imported, and if not then
// Zotero.Attachments.importEmbeddedImage does. // Zotero.Attachments.importEmbeddedImage does.
// Additionally, the allready imported images should never be // Additionally, the allready imported images should never be

1
note-editor Submodule

@ -0,0 +1 @@
Subproject commit 89c15b7e29a4f0f8e051260f2fcdbe6f2f1a2e84

2
scripts/build.js
View file

@ -7,7 +7,7 @@ const getSass = require('./sass');
const getSymlinks = require('./symlinks'); const getSymlinks = require('./symlinks');
const getPDFReader = require('./pdf-reader'); const getPDFReader = require('./pdf-reader');
const getPDFWorker = require('./pdf-worker'); const getPDFWorker = require('./pdf-worker');
const getZoteroNoteEditor = require('./zotero-note-editor'); const getZoteroNoteEditor = require('./note-editor');
const { formatDirsForMatcher, getSignatures, writeSignatures, cleanUp, onSuccess, onError} = require('./utils'); const { formatDirsForMatcher, getSignatures, writeSignatures, cleanUp, onSuccess, onError} = require('./utils');
const { dirs, symlinkDirs, copyDirs, symlinkFiles, jsFiles, scssFiles, ignoreMask } = require('./config'); const { dirs, symlinkDirs, copyDirs, symlinkFiles, jsFiles, scssFiles, ignoreMask } = require('./config');

2
scripts/clean.js
View file

@ -19,7 +19,7 @@ if (require.main === module) {
await getClean(path.join(ROOT, '.signatures.json')); await getClean(path.join(ROOT, '.signatures.json'));
await getClean(path.join(ROOT, 'pdf-reader/build')); await getClean(path.join(ROOT, 'pdf-reader/build'));
await getClean(path.join(ROOT, 'pdf-worker/build')); await getClean(path.join(ROOT, 'pdf-worker/build'));
await getClean(path.join(ROOT, 'zotero-note-editor/build')); await getClean(path.join(ROOT, 'note-editor/build'));
} catch (err) { } catch (err) {
process.exitCode = 1; process.exitCode = 1;
global.isError = true; global.isError = true;

16
scripts/zotero-note-editor.js → scripts/note-editor.js
View file

@ -9,14 +9,14 @@ const { buildsURL } = require('./config');
async function getZoteroNoteEditor(signatures) { async function getZoteroNoteEditor(signatures) {
const t1 = Date.now(); const t1 = Date.now();
const { stdout } = await exec('git rev-parse HEAD', { cwd: './zotero-note-editor' }); const { stdout } = await exec('git rev-parse HEAD', { cwd: './note-editor' });
const hash = stdout.trim(); const hash = stdout.trim();
if (!('zotero-note-editor' in signatures) || signatures['zotero-note-editor'].hash !== hash) { if (!('note-editor' in signatures) || signatures['note-editor'].hash !== hash) {
const targetDir = 'build/resource/zotero-note-editor/'; const targetDir = 'build/resource/note-editor/';
try { try {
const filename = hash + '.zip'; const filename = hash + '.zip';
const tmpDir = 'tmp/builds/zotero-note-editor/'; const tmpDir = 'tmp/builds/note-editor/';
const url = buildsURL + 'client-note-editor/' + filename; const url = buildsURL + 'client-note-editor/' + filename;
await exec( await exec(
`mkdir -p ${tmpDir}` `mkdir -p ${tmpDir}`
@ -28,16 +28,16 @@ async function getZoteroNoteEditor(signatures) {
); );
} }
catch (e) { catch (e) {
await exec('npm ci;npm run build', { cwd: 'zotero-note-editor' }); await exec('npm ci;npm run build', { cwd: 'note-editor' });
await fs.copy('zotero-note-editor/build/zotero', targetDir); await fs.copy('note-editor/build/zotero', targetDir);
} }
signatures['zotero-note-editor'] = { hash }; signatures['note-editor'] = { hash };
} }
const t2 = Date.now(); const t2 = Date.now();
return { return {
action: 'zotero-note-editor', action: 'note-editor',
count: 1, count: 1,
totalCount: 1, totalCount: 1,
processingTime: t2 - t1 processingTime: t2 - t1

1
zotero-note-editor

@ -1 +0,0 @@
Subproject commit b0df1226fec688b372b06e925a0c7a528a258983