Skip to content

Affix not working correctly #11

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

Open
mcinp wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Affix not working correctly #11

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
de82981
Affix not working correctly
mcinp Mar 26, 2014
ea41f71
Update bootstrap-scrollspy_prototype.js
mcinp May 4, 2014
b571dba
Update bootstrap-scrollspy_prototype.js
mcinp May 4, 2014
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
7 changes: 4 additions & 3 deletions js/bootstrap-affix_prototype.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ BootStrap.Affix = Class.create({
, offset = this.options.offset
, offsetBottom = offset.bottom
, offsetTop = offset.top
, reset = 'affix affix-top affix-bottom'
, reset = ['affix','affix-top','affix-bottom']
, affix

if (typeof offset != 'object') offsetBottom = offsetTop = offset
Expand All @@ -79,7 +79,8 @@ BootStrap.Affix = Class.create({
this.affixed = affix
this.unpin = affix == 'bottom' ? position.top - scrollTop : null

this.$element.removeClassName(reset).addClassName('affix' + (affix ? '-' + affix : ''))
$(reset).each(function(a){Element.removeClassName(this.$element,a)},this)
this.$element.addClassName('affix' + (affix ? '-' + affix : ''))
}
});

Expand All @@ -92,4 +93,4 @@ Event.observe(window,'load',function(){

new BootStrap.Affix($spy,data);
})
})
})
13 changes: 7 additions & 6 deletions js/bootstrap-scrollspy_prototype.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ BootStrap.ScrollSpy = Class.create({
var href

Object.extend(this.options, options)
this.$scrollElement = $element.observe('scroll', this.process.bind(this))
this.$scrollElement = Event.observe($element,'scroll', this.process.bind(this))
this.selector = (this.options.target
|| ((href = element.readAttribute('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
|| '') + ' .nav li > a'
Expand All @@ -70,18 +70,18 @@ BootStrap.ScrollSpy = Class.create({
var href = $el.readAttribute('data-target') || $el.readAttribute('href')
var $href = /^#\w/.test(href) && $$(href).first()
return ( $href
&& [ $href.viewportOffset().top - $href.getHeight() + ((this.$scrollElement != window) && this.$scrollElement.cumulativeScrollOffset().top), href ] ) || null
&& [ $href.cumulativeOffset().top + ((this.$scrollElement != window) && this.$scrollElement.cumulativeScrollOffset().top), href ] ) || null
},this).without(false,null)
.sort(function (a, b) { return a - b })
.sort(function (a, b) { return a[0] - b[0] })
.each(function(v){
this.offsets.push(v[0])
this.targets.push(v[1])
},this)
},
process: function () {
var scrollTop = this.$scrollElement.cumulativeScrollOffset().top + this.options.offset
var scrollTop = (this.$scrollElement===window?document.viewport.getScrollOffsets().top:this.$scrollElement.cumulativeScrollOffset().top) + this.options.offset
var scrollHeight = this.$scrollElement.scrollHeight || this.$body.scrollHeight
var maxScroll = scrollHeight - this.$scrollElement.getHeight()
var maxScroll = scrollHeight - (this.$scrollElement===window?document.viewport.getHeight():this.$scrollElement.getHeight())
var offsets = this.offsets
var targets = this.targets
var activeTarget = this.activeTarget
Expand Down Expand Up @@ -126,4 +126,5 @@ Event.observe(window,'load', function () {
$$('[data-spy="scroll"]').each(function(element) {
new BootStrap.ScrollSpy(element)
})
})
})