From c9da85f4db71cccbaf2f16a774bd9b734d1db3d0 Mon Sep 17 00:00:00 2001 From: Cox Chen Date: Wed, 3 Apr 2013 22:55:18 +0800 Subject: [PATCH 1/6] Fixed a bug in Segmented controller when swapping content sections back and forth --- lib/js/segmented-controllers.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/js/segmented-controllers.js b/lib/js/segmented-controllers.js index 6c1111d..8f785d9 100644 --- a/lib/js/segmented-controllers.js +++ b/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,9 +36,13 @@ if (!targetBody) return; - activeBody = targetBody.parentNode.querySelector(classSelector); + activeBodies = targetBody.parentNode.querySelectorAll(classSelector); - if (activeBody) activeBody.classList.remove(className); + if (activeBodies) { + for (var i = 0; i < activeBodies.length; i++){ + activeBodies[i].classList.remove(className); + } + } targetBody.classList.add(className) }); From a58ce0e8915a255c0aaa4c8bc66419c570e45222 Mon Sep 17 00:00:00 2001 From: Cox Chen Date: Wed, 3 Apr 2013 22:55:58 +0800 Subject: [PATCH 2/6] Added missing semicolon --- lib/js/segmented-controllers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/js/segmented-controllers.js b/lib/js/segmented-controllers.js index 8f785d9..3bc1052 100644 --- a/lib/js/segmented-controllers.js +++ b/lib/js/segmented-controllers.js @@ -44,7 +44,7 @@ } } - targetBody.classList.add(className) + targetBody.classList.add(className); }); window.addEventListener('click', function (e) { if (getTarget(e.target)) e.preventDefault(); }); From 4e91d1eb8b33be36c836d3806e918371937cd4e6 Mon Sep 17 00:00:00 2001 From: Cox Chen Date: Wed, 3 Apr 2013 22:56:42 +0800 Subject: [PATCH 3/6] Build dist/ratchet.js --- dist/ratchet.js | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dist/ratchet.js b/dist/ratchet.js index 084a559..d4848e5 100644 --- a/dist/ratchet.js +++ b/dist/ratchet.js @@ -117,12 +117,13 @@ 'slide-out' : 'slide-in', 'fade' : 'fade' }; + var bars = { bartab : '.bar-tab', bartitle : '.bar-title', barfooter : '.bar-footer', barheadersecondary : '.bar-header-secondary' - } + }; var cacheReplace = function (data, updates) { PUSH.id = data.id; @@ -509,7 +510,8 @@ window.addEventListener('click', function (e) { if (getTarget(e)) e.preventDefault(); }); window.addEventListener('popstate', popstate); -}();/* ---------------------------------- +}(); +/* ---------------------------------- * TABS v1.0.0 * Licensed under The MIT License * http://opensource.org/licenses/MIT @@ -525,7 +527,7 @@ window.addEventListener("touchend", function (e) { var activeTab; - var activeBody; + var activeBodies; var targetBody; var targetTab; var className = 'active'; @@ -547,11 +549,15 @@ if (!targetBody) return; - activeBody = targetBody.parentNode.querySelector(classSelector); + activeBodies = targetBody.parentNode.querySelectorAll(classSelector); - if (activeBody) activeBody.classList.remove(className); + if (activeBodies) { + 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(); }); From fd352823dde43054051228b4d4489358c666b3b4 Mon Sep 17 00:00:00 2001 From: Cox Chen Date: Thu, 4 Apr 2013 21:14:04 +0800 Subject: [PATCH 4/6] Removed unnecessary check since querySelectorAll always returns a NodeList --- lib/js/segmented-controllers.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/js/segmented-controllers.js b/lib/js/segmented-controllers.js index 3bc1052..ae89bc4 100644 --- a/lib/js/segmented-controllers.js +++ b/lib/js/segmented-controllers.js @@ -38,10 +38,8 @@ activeBodies = targetBody.parentNode.querySelectorAll(classSelector); - if (activeBodies) { - for (var i = 0; i < activeBodies.length; i++){ - activeBodies[i].classList.remove(className); - } + for (var i = 0; i < activeBodies.length; i++){ + activeBodies[i].classList.remove(className); } targetBody.classList.add(className); From b79c0f43fef81f06effd596141d7dd10104fef77 Mon Sep 17 00:00:00 2001 From: Cox Chen Date: Thu, 4 Apr 2013 21:16:15 +0800 Subject: [PATCH 5/6] Build dist/ratchet.js --- dist/ratchet.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dist/ratchet.js b/dist/ratchet.js index d4848e5..c995983 100644 --- a/dist/ratchet.js +++ b/dist/ratchet.js @@ -551,10 +551,8 @@ activeBodies = targetBody.parentNode.querySelectorAll(classSelector); - if (activeBodies) { - for (var i = 0; i < activeBodies.length; i++){ - activeBodies[i].classList.remove(className); - } + for (var i = 0; i < activeBodies.length; i++){ + activeBodies[i].classList.remove(className); } targetBody.classList.add(className); From 40b809de65a5e23f15021bb2e8aec53c2fc0d61b Mon Sep 17 00:00:00 2001 From: Cox Chen Date: Mon, 15 Apr 2013 14:58:56 +0800 Subject: [PATCH 6/6] Added space after the paren in i++) { --- dist/ratchet.js | 2 +- lib/js/segmented-controllers.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/ratchet.js b/dist/ratchet.js index c995983..12be2b5 100644 --- a/dist/ratchet.js +++ b/dist/ratchet.js @@ -551,7 +551,7 @@ activeBodies = targetBody.parentNode.querySelectorAll(classSelector); - for (var i = 0; i < activeBodies.length; i++){ + for (var i = 0; i < activeBodies.length; i++) { activeBodies[i].classList.remove(className); } diff --git a/lib/js/segmented-controllers.js b/lib/js/segmented-controllers.js index ae89bc4..8e54923 100644 --- a/lib/js/segmented-controllers.js +++ b/lib/js/segmented-controllers.js @@ -38,7 +38,7 @@ activeBodies = targetBody.parentNode.querySelectorAll(classSelector); - for (var i = 0; i < activeBodies.length; i++){ + for (var i = 0; i < activeBodies.length; i++) { activeBodies[i].classList.remove(className); }