Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add basic voice rendering #3

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open

Add basic voice rendering #3

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
d93b691
working easyscore basics
ywsang Jun 10, 2020
ea00eae
Move note creation to vf-voice
ywsang Jun 24, 2020
cde7b0d
Switch to setters for passing data down
ywsang Jun 24, 2020
e6a3c04
Combine score and factory event for vf-voice
ywsang Jun 25, 2020
b73502a
Use spread to remove reduce/concat
ywsang Jun 25, 2020
ec64a48
Merge pull request #1 from PolymerLabs/easyscore-basics
ywsang Jun 26, 2020
017cbf4
Copy files over, add comments
ywsang Jul 7, 2020
9e89a42
Update testing setup for web components
ywsang Jul 7, 2020
fa6169b
Add comments
ywsang Jul 7, 2020
ab260f5
Add more documentation, make things private
ywsang Jul 8, 2020
3c4d2de
Remove app.js test file
ywsang Jul 8, 2020
ef61927
Fix switch syntax
ywsang Jul 8, 2020
bfee025
Move index to demo file, add script for es-dev-server
ywsang Jul 8, 2020
ad8e18a
Add documentation in test runner
ywsang Jul 9, 2020
14ab97b
Use one event for setting child factory instances
ywsang Jul 9, 2020
a299777
Add more event classes
ywsang Jul 9, 2020
2d6079f
Fix webpack config to make qunit tests run
ywsang Jul 9, 2020
135566d
Fix web components test
ywsang Jul 9, 2020
3e33ac1
Finish moving events to their own classes
ywsang Jul 9, 2020
d41de20
Remove detail from vf-voice event
ywsang Jul 9, 2020
91acbc3
Add factory TODO
ywsang Jul 9, 2020
84b6b28
Upgrade jsdom, add polyfill?
ywsang Jul 10, 2020
c9d243c
Remove multiple empty lines
ywsang Jul 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ module.exports = (grunt) => {
const BASE_DIR = __dirname;
const BUILD_DIR = path.join(BASE_DIR, 'build');
const RELEASE_DIR = path.join(BASE_DIR, 'releases');
const MODULE_ENTRY = path.join(BASE_DIR, 'src/index.js');
const VEXFLOW_MODULE_ENTRY = path.join(BASE_DIR, 'src/index.js');
const WEB_COMPONENTS_MODULE_ENTRY = path.join(BASE_DIR, 'src/web-components/index.js');
const TARGET_RAW = 'vexflow-debug.js';
const TARGET_MIN = 'vexflow-min.js';

Expand All @@ -31,11 +32,14 @@ module.exports = (grunt) => {
function webpackConfig(target, preset, mode) {
return {
mode,
entry: MODULE_ENTRY,
entry: {
vexflow: VEXFLOW_MODULE_ENTRY,
webComponents: WEB_COMPONENTS_MODULE_ENTRY,
},
output: {
path: BUILD_DIR,
filename: target,
library: 'Vex',
filename: (mode === 'production') ? '[name]-min.js' : '[name]-debug.js',
justinfagnani marked this conversation as resolved.
Show resolved Hide resolved
library: '[name]',
libraryTarget: 'umd',
libraryExport: 'default',
},
Expand All @@ -49,7 +53,7 @@ module.exports = (grunt) => {
loader: 'babel-loader',
options: {
presets: [preset],
plugins: ['@babel/plugin-transform-object-assign'],
plugins: ['@babel/plugin-transform-object-assign', '@babel/plugin-proposal-class-properties'],
ywsang marked this conversation as resolved.
Show resolved Hide resolved
},
}],
},
Expand Down
15 changes: 15 additions & 0 deletions app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// EasyScore API Example

ywsang marked this conversation as resolved.
Show resolved Hide resolved
import Vex from './src/index.js';
const VF = Vex.Flow;

// Create an SVG renderer and attach it to the DIV element named "boo".
var vf = new VF.Factory({renderer: {elementId: null}});
var score = vf.EasyScore();
var system = vf.System();

system.addStave({
voices: [score.voice(score.notes('C#5/q, B4, A4, G#4'))]
}).addClef('treble').addTimeSignature('4/4');

vf.draw();
24 changes: 24 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<html>
ywsang marked this conversation as resolved.
Show resolved Hide resolved
<head>
<title>Vexflow Component</title>
<script type="module" src='./src/web-components/index.js'></script>
</head>
<body>
<!-- For testing the EasyScore API example
<div id="boo"></div>
<script type="module" src="./app.js"></script> -->

<vf-score height=300>
<vf-system>
<vf-stave clef='treble' timeSig='4/4' keySig='Bb'>
<vf-voice autoBeam>C5/q, (C4 Eb4 G4)/q, A4, G4/16, A4, B4, C5</vf-voice>
<vf-voice stem='up'>C#4/h, C#4</vf-voice>
</vf-stave>
<vf-stave clef='bass' timeSig='4/4' keySig='Bb'>
<vf-voice autoBeam>C3/q, (C3 Eb3 G3)/q, A2/q, B2</vf-voice>
</vf-stave>
</vf-system>
</vf-score>

</body>
</html>
Loading