From 99349faf339a6f077b17f306046625150244d971 Mon Sep 17 00:00:00 2001 From: jordanmccullough Date: Sun, 4 Jan 2015 21:40:28 -0700 Subject: [PATCH 1/3] Fix bug on JS slide wrapping jQuery `wrapAll` applied malformed double nested div. --- _javascript/curriculum.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_javascript/curriculum.js b/_javascript/curriculum.js index 473de6430..95fcc8ef6 100644 --- a/_javascript/curriculum.js +++ b/_javascript/curriculum.js @@ -21,7 +21,7 @@ $(function(){ url: "https://api.github.com/users/"+username, success: function(data, textStatus, jqXHR){ $("#teacher-name").html(data.name); - + $("", { text: data.login @@ -130,7 +130,7 @@ $(function(){ even = $("hr:even"); even.each(function(index){ - $(this).nextUntil("hr").wrapAll("
"); + $(this).nextUntil("hr").wrapAll("
"); }); $(".slide").css("height", h + "px"); From 08afb2fa59ed40b593dde3c5a10b59b554a16149 Mon Sep 17 00:00:00 2001 From: jordanmccullough Date: Sun, 4 Jan 2015 22:27:54 -0700 Subject: [PATCH 2/3] Simplify slide-only toggle logic --- _javascript/curriculum.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/_javascript/curriculum.js b/_javascript/curriculum.js index 95fcc8ef6..e8477cfa4 100644 --- a/_javascript/curriculum.js +++ b/_javascript/curriculum.js @@ -3,9 +3,7 @@ $(function(){ // Bind checkbox/label click for slide toggle $("#slide-only-toggle").change(function(){ - var checkState = $("#slide-only-toggle").attr("checked"); - $(".materials > *").toggleClass("hidden"); - $(".slide").toggleClass("hidden"); + $(".materials > *").not(".slide").toggleClass("hidden"); }); // Parse username from querystring @@ -86,7 +84,6 @@ $(function(){ }).appendTo("#teacher-following"); $("#teacher").toggleClass("hidden"); - $("#teacher").toggleClass("slide"); updateSlideSize(); } From cb589b3cf9519f970d4731f9b0ff99f08b035e81 Mon Sep 17 00:00:00 2001 From: jordanmccullough Date: Sun, 4 Jan 2015 22:28:30 -0700 Subject: [PATCH 3/3] Use "slide" style be default on teacher cover --- _layouts/curriculum.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_layouts/curriculum.html b/_layouts/curriculum.html index 3482fb6a0..4a9109e10 100644 --- a/_layouts/curriculum.html +++ b/_layouts/curriculum.html @@ -66,9 +66,9 @@
-