diff options
| author | Nicolas Bornand <nicolas74@gmail.com> | 2014-05-11 13:25:36 +0200 |
|---|---|---|
| committer | Nicolas Bornand <nicolas74@gmail.com> | 2014-05-11 13:25:36 +0200 |
| commit | d559fccdb5dd6eb57a1c0029a677c90408f38c46 (patch) | |
| tree | 56cd8d92edbfe6abd6e435b82bb4b642646cfbea | |
| parent | 17444bc53876df25c17c62493fd1000e6d617659 (diff) | |
| download | playGraph-d559fccdb5dd6eb57a1c0029a677c90408f38c46.tar.gz playGraph-d559fccdb5dd6eb57a1c0029a677c90408f38c46.tar.bz2 playGraph-d559fccdb5dd6eb57a1c0029a677c90408f38c46.zip | |
song label
| -rw-r--r-- | app/data.json | 36 | ||||
| -rw-r--r-- | app/index.html | 2 | ||||
| -rw-r--r-- | app/js/app.js | 54 |
3 files changed, 60 insertions, 32 deletions
diff --git a/app/data.json b/app/data.json index f2fd332..87e2933 100644 --- a/app/data.json +++ b/app/data.json @@ -22,43 +22,53 @@ }, { "x": 90, - "y": 230 + "y": 230, + "label":"train" }, { "x": 400, - "y": 300 + "y": 300, + "label":"piste x" }, { "x": 100, - "y": 220 + "y": 220, + "label":"piste x" }, { "x": 200, - "y": 20 + "y": 20, + "label":"piste x" }, { "x": 150, - "y": 450 + "y": 450, + "label":"piste x" }, { "x": 70, - "y": 80 + "y": 80, + "label":"piste x" }, { "x": 400, - "y": 80 - } + "y": 80, + "label":"piste x" + }, { "x": 420, - "y": 40 - } + "y": 40, + "label":"piste x" + }, { "x": 390, - "y": 65 - } + "y": 65, + "label":"piste x" + }, { "x": 440, - "y": 120 + "y": 120, + "label":"piste x" } ] }
\ No newline at end of file diff --git a/app/index.html b/app/index.html index d4433a3..b3bc63a 100644 --- a/app/index.html +++ b/app/index.html @@ -50,7 +50,7 @@ <div data-ng-repeat="point in points" data-pg-draggable="point" class="point" style="top: {{point.y}}px; left: {{point.x}}px;" data-ng-class="{selected: point.selected==true}"> <div class="circle"></div> - <div class="songLabel"><p>test</p></div> + <div class="songLabel"><p>{{point.label}}</p></div> </div> </div> diff --git a/app/js/app.js b/app/js/app.js index fab738a..504311b 100644 --- a/app/js/app.js +++ b/app/js/app.js @@ -10,75 +10,93 @@ var Point = function(x,y){ var dummyPoints= [ { x: 10, - y: 20 + y: 20, + label:"offspring" }, { x: 30, - y: 30 + y: 30, + label:"gunther" }, { x: 50, - y: 25 + y: 25, + label:"bloodhoung gang" }, { x: 60, - y: 200 + y: 200, + label:"linkin park" }, { x: 90, - y: 230 + y: 230, + label:"savant" }, { x: 400, - y: 300 + y: 300, + label:"tac tac" }, { x: 100, - y: 220 + y: 220, + label:"piste x" }, { x: 200, - y: 20 + y: 20, + label:"piste y" }, { x: 150, - y: 450 + y: 450, + label:"piste z" }, { x: 70, - y: 80 + y: 80, + label:"piste a" }, { x: 400, - y: 80 + y: 80, + label:"piste b" }, { x: 430, - y: 90 + y: 90, + label:"piste c" }, { x: 420, - y: 65 + y: 65, + label:"piste d" }, { x: 380, - y: 320 + y: 320, + label:"piste e" }, { x: 490, - y: 340 + y: 340, + label:"piste f" }, { x: 400, - y: 400 + y: 400, + label:"piste f" }, { x: 480, - y: 360 + y: 360, + label:"piste f" }, { x: 420, - y: 490 + y: 490, + label:"piste f" } ] |