Browse Source

Merge branch 'master' into 2.0.0-wip

pull/214/head
connors 11 years ago
parent
commit
4093770622
  1. 12
      dist/ratchet.js
  2. 10
      lib/js/segmented-controllers.js

12
dist/ratchet.js vendored

@ -467,7 +467,7 @@
window.addEventListener("touchend", function (e) {
var activeTab;
var activeBody;
var activeBodies;
var targetBody;
var targetTab;
var className = 'active';
@ -489,11 +489,13 @@
if (!targetBody) return;
activeBody = targetBody.parentNode.querySelector(classSelector);
activeBodies = targetBody.parentNode.querySelectorAll(classSelector);
if (activeBody) activeBody.classList.remove(className);
for (var i = 0; i < activeBodies.length; i++) {
activeBodies[i].classList.remove(className);
}
targetBody.classList.add(className)
targetBody.classList.add(className);
});
window.addEventListener('click', function (e) { if (getTarget(e.target)) e.preventDefault(); });
@ -703,4 +705,4 @@
toggle = false;
});
}();
}();

10
lib/js/segmented-controllers.js

@ -14,7 +14,7 @@
window.addEventListener("touchend", function (e) {
var activeTab;
var activeBody;
var activeBodies;
var targetBody;
var targetTab;
var className = 'active';
@ -36,11 +36,13 @@
if (!targetBody) return;
activeBody = targetBody.parentNode.querySelector(classSelector);
activeBodies = targetBody.parentNode.querySelectorAll(classSelector);
if (activeBody) activeBody.classList.remove(className);
for (var i = 0; i < activeBodies.length; i++) {
activeBodies[i].classList.remove(className);
}
targetBody.classList.add(className)
targetBody.classList.add(className);
});
window.addEventListener('click', function (e) { if (getTarget(e.target)) e.preventDefault(); });

Loading…
Cancel
Save