Remove sidebar class from forum nav

This will enable much cleanup of the relevant SASS rules.
This commit is contained in:
Greg Price
2014-07-03 14:16:21 -04:00
parent f3a8436e68
commit a4de82e1c3
9 changed files with 35 additions and 10 deletions

View File

@@ -147,7 +147,7 @@ describe "DiscussionThreadListView", ->
</div>
</div>
</script>
<div class="sidebar"></div>
<div class="forum-nav"></div>
"""
@threads = [
makeThreadWithProps({
@@ -176,7 +176,7 @@ describe "DiscussionThreadListView", ->
spyOn($, "ajax")
@discussion = new Discussion([])
@view = new DiscussionThreadListView({collection: @discussion, el: $(".sidebar")})
@view = new DiscussionThreadListView({collection: @discussion, el: $(".forum-nav")})
@view.render()
makeThreadWithProps = (props) ->
@@ -196,7 +196,7 @@ describe "DiscussionThreadListView", ->
makeView = (discussion) ->
return new DiscussionThreadListView(
el: $(".sidebar"),
el: $(".forum-nav"),
collection: discussion
)

View File

@@ -8,7 +8,7 @@ if Backbone?
@discussion = options['discussion']
@course_settings = options['course_settings']
@nav = new DiscussionThreadListView(collection: @discussion, el: $(".sidebar"))
@nav = new DiscussionThreadListView(collection: @discussion, el: $(".forum-nav"))
@nav.on "thread:selected", @navigateToThread
@nav.on "thread:removed", @navigateToAllThreads
@nav.on "threads:rendered", @setActiveThread

View File

@@ -89,7 +89,7 @@ if Backbone?
discussionsBodyTop = if discussionBody[0] then discussionBody.offset().top
discussionsBodyBottom = discussionsBodyTop + discussionBody.outerHeight()
sidebar = $(".sidebar")
sidebar = $(".forum-nav")
if scrollTop > discussionsBodyTop - @sidebar_padding
sidebar.css('top', scrollTop - discussionsBodyTop + @sidebar_padding);
else