Skip to content

Commit 213d72f

Browse files
committed
merge changes for verovio facsimile and file structure changes
1 parent 3f2113a commit 213d72f

File tree

6 files changed

+533
-330
lines changed

6 files changed

+533
-330
lines changed

Neon-gh/assets/js/verovio-toolkit-wasm.js

Lines changed: 440 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Neon-gh/assets/js/verovio-toolkit.js

Lines changed: 0 additions & 298 deletions
This file was deleted.

Neon-gh/dashboard.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Neon-gh/editor.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Neon-gh/workers/VerovioWorker-dev.js

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
importScripts('../assets/js/verovio-toolkit-wasm.js');
2+
3+
let toolkit;
4+
const backlog = [];
5+
6+
/**
7+
* Parse and respond to messages sent by NeonCore.
8+
* @param {MessageEvent} evt
9+
*/
10+
function handleNeonEvent (evt) {
11+
const data = evt.data;
12+
const result = {
13+
id: data.id
14+
};
15+
16+
switch (data.action) {
17+
case 'renderData':
18+
result.svg = toolkit.renderData(data.mei, {});
19+
break;
20+
case 'getElementAttr':
21+
result.attributes = toolkit.getElementAttr(data.elementId);
22+
break;
23+
case 'edit':
24+
result.result = toolkit.edit(data.editorAction);
25+
break;
26+
case 'getMEI':
27+
result.mei = toolkit.getMEI({
28+
pageNo: 0,
29+
scoreBased: true
30+
});
31+
break;
32+
case 'editInfo':
33+
result.info = toolkit.editInfo();
34+
break;
35+
case 'renderToSVG':
36+
result.svg = toolkit.renderToSVG(1);
37+
break;
38+
default:
39+
break;
40+
}
41+
postMessage(result);
42+
}
43+
44+
45+
verovio.module.onRuntimeInitialized = function () {
46+
47+
toolkit = new verovio.toolkit();
48+
toolkit.setOptions({
49+
inputFrom: 'mei',
50+
footer: 'none',
51+
header: 'none',
52+
pageMarginLeft: 0,
53+
pageMarginTop: 0,
54+
font: 'Bravura',
55+
useFacsimile: false,
56+
});
57+
console.debug('READY');
58+
onmessage = handleNeonEvent;
59+
for (const message of backlog) {
60+
handleNeonEvent(message);
61+
}
62+
}
63+
64+
65+
function tempHandler (evt) {
66+
backlog.push(evt);
67+
}
68+
69+
onmessage = tempHandler;

Neon-gh/workers/VerovioWorker.js

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -39,31 +39,23 @@ function handleNeonEvent (evt) {
3939
postMessage(result);
4040
}
4141

42-
var Module = {
43-
onRuntimeInitialized: () => {
42+
importScripts('https://www.verovio.org/javascript/develop/verovio-toolkit-wasm.js');
4443

45-
toolkit = new verovio.toolkit();
46-
toolkit.setOptions({
47-
inputFrom: 'mei',
48-
footer: 'none',
49-
header: 'none',
50-
pageMarginLeft: 0,
51-
pageMarginTop: 0,
52-
font: 'Bravura',
53-
useFacsimile: true,
54-
});
55-
console.debug('READY');
56-
onmessage = handleNeonEvent;
57-
for (const message of backlog) {
58-
handleNeonEvent(message);
59-
}
60-
}
61-
};
62-
63-
importScripts('../assets/js/verovio-toolkit.js');
44+
verovio.module.onRuntimeInitialized = () => {
6445

65-
function tempHandler (evt) {
66-
backlog.push(evt);
67-
}
68-
69-
onmessage = tempHandler;
46+
toolkit = new verovio.toolkit();
47+
toolkit.setOptions( {
48+
inputFrom: 'mei',
49+
footer: 'none',
50+
header: 'none',
51+
pageMarginLeft: 0,
52+
pageMarginTop: 0,
53+
font: 'Bravura',
54+
useFacsimile: false,
55+
});
56+
console.debug('READY');
57+
onmessage = handleNeonEvent;
58+
for (const message of backlog) {
59+
handleNeonEvent(message);
60+
}
61+
};

0 commit comments

Comments
 (0)