Browse Source

Merge branch 'master' into 2.0.0-wip

pull/214/head
connors 12 years ago
parent
commit
d35310d526
  1. 7
      dist/ratchet.js
  2. 5
      lib/js/modals.js
  3. 2
      lib/js/sliders.js

7
dist/ratchet.js vendored

@ -29,7 +29,10 @@
window.addEventListener('touchend', function (event) { window.addEventListener('touchend', function (event) {
var modal = getModal(event); var modal = getModal(event);
if (modal) modal.classList.toggle('active'); if (modal) {
modal.classList.toggle('active');
event.preventDefault(); // prevents rewriting url (apps can still use hash values in url)
}
}); });
}(); }();
/* ---------------------------------- /* ----------------------------------
@ -770,4 +773,4 @@
toggle = false; toggle = false;
}); });
}(); }();

5
lib/js/modals.js

@ -20,6 +20,9 @@
window.addEventListener('touchend', function (event) { window.addEventListener('touchend', function (event) {
var modal = getModal(event); var modal = getModal(event);
if (modal) modal.classList.toggle('active'); if (modal) {
modal.classList.toggle('active');
event.preventDefault(); // prevents rewriting url (apps can still use hash values in url)
}
}); });
}(); }();

2
lib/js/sliders.js

@ -56,6 +56,8 @@
startTime = +new Date; startTime = +new Date;
pageX = e.touches[0].pageX; pageX = e.touches[0].pageX;
pageY = e.touches[0].pageY; pageY = e.touches[0].pageY;
deltaX = 0;
deltaY = 0;
setSlideNumber(0); setSlideNumber(0);

Loading…
Cancel
Save