# HG changeset patch
# User veltr
# Date 1363968233 -3600
# Node ID 81a8bb1d872a81168ba503f298c18c7330f25335
# Parent 9833f3e24105d0655a5aa112012d92b8df4c0a5e
ipad bugfixes
diff -r 9833f3e24105 -r 81a8bb1d872a js/playscreen.js
--- a/js/playscreen.js Thu Mar 21 18:48:12 2013 +0100
+++ b/js/playscreen.js Fri Mar 22 17:03:53 2013 +0100
@@ -795,8 +795,19 @@
.on("touch", function(e) {
startLevel = currentlevel;
})
- .on("pinchin", function(e) {
- var newlevel = Math.max(0, Math.min(zoomlevels.length - 1, startLevel + Math.round(Math.log(e.gesture.scale)*scaleStep)));
+ .on("pinchin pinchout", function(e) {
+ var x = e.gesture.center.pageX - $(this).offset().left;
+ if (x > 380) {
+ return;
+ }
+ var newlevel = Math.max(
+ 0,
+ Math.min(
+ zoomlevels.length - 1,
+ startLevel + Math.round(Math.log(e.gesture.scale)*scaleStep) * (x > 140 ? 1 : -1)
+ )
+ );
+ //$("#konsole").text(e.gesture.scale + " => " + newlevel);
if (newlevel !== currentlevel) {
currentlevel = newlevel;
localduration = zoomlevels[currentlevel];
diff -r 9833f3e24105 -r 81a8bb1d872a js/startscreen.js
--- a/js/startscreen.js Thu Mar 21 18:48:12 2013 +0100
+++ b/js/startscreen.js Fri Mar 22 17:03:53 2013 +0100
@@ -285,7 +285,7 @@
}
}
- var url = "playscreen.html#visibletopics="
+ var hash = "#visibletopics="
+ Array.prototype.join.call($(".topic:visible").map(function(){return $(this).attr("data-topic-id")}))
+ "&selectedtopics="
+ Array.prototype.slice.call(topicsAndColors.map(function(t){return t.id}))
@@ -294,7 +294,7 @@
return encodeURIComponent(w);
}).join(",");
- $(".play-button").attr("href",url);
+ document.querySelector(".play-button").hash = hash;
}
diff -r 9833f3e24105 -r 81a8bb1d872a playscreen.html
--- a/playscreen.html Thu Mar 21 18:48:12 2013 +0100
+++ b/playscreen.html Fri Mar 22 17:03:53 2013 +0100
@@ -54,6 +54,7 @@
+
diff -r 9833f3e24105 -r 81a8bb1d872a startscreen-frame.html
--- a/startscreen-frame.html Thu Mar 21 18:48:12 2013 +0100
+++ b/startscreen-frame.html Fri Mar 22 17:03:53 2013 +0100
@@ -29,7 +29,7 @@