From 647bdc5802c3959041c5e1134cba3b289038e67d Mon Sep 17 00:00:00 2001
From: Nicolas Bornand <nicolas74@gmail.com>
Date: Sun, 11 May 2014 11:49:47 +0200
Subject: Merge origin/master

Conflicts:
	app/js/services.js
---
 app/index.html     | 2 +-
 app/js/services.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/index.html b/app/index.html
index 843df21..de6de88 100644
--- a/app/index.html
+++ b/app/index.html
@@ -17,7 +17,7 @@
         <div class="world" style="width: 100%; height: 500px;">
             <div data-pg-line="line" class="line" resize></div>
 
-            <div data-ng-repeat="point in points" data-pg-draggable="point" class="point" style="top: {{point.x}}px; left: {{point.y}}px;" data-ng-class="{selected: point.selected==true}"><div></div></div>
+            <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></div></div>
         </div>
 
         <ul>
diff --git a/app/js/services.js b/app/js/services.js
index 6a883d3..035000e 100644
--- a/app/js/services.js
+++ b/app/js/services.js
@@ -13,7 +13,7 @@ app.service('pathService', function() {
             //compute distances from the constrain path
             console.log('length',line.length);
             
-            var threshold = 40;
+            var threshold = 100;
             angular.forEach(songList, function(song){
                 song.selected = false;
             });
-- 
cgit v1.2.3