From b8c59702e98d7d2d75c811634d5ae000d6c7ae8f Mon Sep 17 00:00:00 2001
From: juliandescottes <julian.descottes@gmail.com>
Date: Wed, 29 Aug 2012 11:51:40 +0200
Subject: [PATCH 1/2] test

---
 js/piskel.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/js/piskel.js b/js/piskel.js
index e3ca2d35..95433cc0 100644
--- a/js/piskel.js
+++ b/js/piskel.js
@@ -369,4 +369,5 @@
   window.piskel = piskel;
   piskel.init();
 
-})(function(id){return document.getElementById(id)});
\ No newline at end of file
+})(function(id){return document.getElementById(id)});
+//small change for checking my git setup :(
\ No newline at end of file

From 00c5975c653c9d7c1193c56374d3d7985884904c Mon Sep 17 00:00:00 2001
From: juliandescottes <julian.descottes@gmail.com>
Date: Wed, 29 Aug 2012 13:43:36 +0200
Subject: [PATCH 2/2] slider

---
 index.html   | 3 ++-
 js/piskel.js | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index f167a51d..1a3c3389 100644
--- a/index.html
+++ b/index.html
@@ -33,7 +33,8 @@
         <div class="canvas-background"></div>
       </div>
       <div>
-        <label>Preview FPS:</label><input id="preview-fps" type="text" value="12" />
+        <input id="preview-fps" type="range" min="1" max="24" value="12" style="width:200px;"/>
+        <span id="fps-value">12 fps</span>
       </div>
     </div>
   </div>
diff --git a/js/piskel.js b/js/piskel.js
index 95433cc0..bdeb03f1 100644
--- a/js/piskel.js
+++ b/js/piskel.js
@@ -148,7 +148,7 @@
       };
       var refreshUpdater = startPreviewRefresh();
       
-      animFPSTuner.addEventListener('keyup', function(evt) {
+      animFPSTuner.addEventListener('change', function(evt) {
         window.clearInterval(refreshUpdater);
         animPreviewFPS = parseInt(animFPSTuner.value, 10);
         if(isNaN(animPreviewFPS)) {
@@ -167,6 +167,7 @@
           animPreviewFPS = 100;
         }
         animFPSTuner.value = animPreviewFPS;
+        $("fps-value").innerHTML = animPreviewFPS + " fps";
         refreshUpdater = startPreviewRefresh();
       });
     },