这是indexloc提供的服务，不要输入任何密码
Skip to content

Bug fix for slide, slide-only modes #300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 5, 2015
Merged

Bug fix for slide, slide-only modes #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99349fa
Fix bug on JS slide wrapping jQuery
Jan 5, 2015
08afb2f
Simplify slide-only toggle logic
Jan 5, 2015
cb589b3
Use "slide" style be default on teacher cover
Jan 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions _javascript/curriculum.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -21,7 +19,7 @@ $(function(){
url: "https://api.github.com/users/"+username,
success: function(data, textStatus, jqXHR){
$("#teacher-name").html(data.name);

$("<span/>",
{
text: data.login
Expand Down Expand Up @@ -86,7 +84,6 @@ $(function(){
}).appendTo("#teacher-following");

$("#teacher").toggleClass("hidden");
$("#teacher").toggleClass("slide");

updateSlideSize();
}
Expand Down Expand Up @@ -130,7 +127,7 @@ $(function(){
even = $("hr:even");

even.each(function(index){
$(this).nextUntil("hr").wrapAll("<div class='slide'><div class='alignment'></div>");
$(this).nextUntil("hr").wrapAll("<div class='slide'><div class='alignment'></div></div>");
});

$(".slide").css("height", h + "px");
Expand Down
4 changes: 2 additions & 2 deletions _layouts/curriculum.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ <h4 class="modal-title" id="timerModalLabel">Help / Shortcuts</h4>
</div>

<div class="col-content deck col-md-12 col-sm-12 col-xs-12 materials curriculum shift-left">
<div id="teacher" class="hidden">
<div id="teacher" class="slide hidden">
<div class="alignment">
<div id="teacher-avatar" class=""></div>
<div id="teacher-avatar"></div>
<div class="" id="teacher-info">

<h3 id="teacher-name"></h3>
Expand Down