diff options
| author | Jakob Odersky <jodersky@gmail.com> | 2014-05-11 13:57:37 +0200 |
|---|---|---|
| committer | Jakob Odersky <jodersky@gmail.com> | 2014-05-11 13:57:37 +0200 |
| commit | 370244a1003e3c16f024116d14401e7959325ede (patch) | |
| tree | 0a00b60688f6ecab51cf13913e161e31058e5866 /app/js/app.js | |
| parent | 89639a36f7412e1855d539dcca26f86e8daa4a0e (diff) | |
| parent | 68579f3a451b910ffa47ed9cc7414a5e0338105f (diff) | |
| download | playGraph-370244a1003e3c16f024116d14401e7959325ede.tar.gz playGraph-370244a1003e3c16f024116d14401e7959325ede.tar.bz2 playGraph-370244a1003e3c16f024116d14401e7959325ede.zip | |
Merge branch 'master' of github.com:jodersky/playGraph
Conflicts:
app/js/directives.js
Diffstat (limited to 'app/js/app.js')
| -rw-r--r-- | app/js/app.js | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/app/js/app.js b/app/js/app.js index c59b849..514f187 100644 --- a/app/js/app.js +++ b/app/js/app.js @@ -135,10 +135,24 @@ var dummyPoints= [ }, { x: 800, - y: 750, + y: 200, label:"piste f" }, - + { + x: 950, + y: 300, + label:"piste f" + }, + { + x: 740, + y: 120, + label:"piste f" + }, + { + x: 900, + y: 320, + label:"piste f" + } ] var Song = function(point){ |