Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions bin/javascripts/jquery.nanoscroller.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bin/javascripts/jquery.nanoscroller.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bin/javascripts/jquery.nanoscroller.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bin/javascripts/jquery.nanoscroller.min.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions bin/readme.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ <h3 id="2-css">2. CSS</h3>
</code></pre>
<p>You should specify a width and a height to your container, and apply some custom styling for your scrollbar. Here&#39;s an example:</p>
<pre><code class="lang-css">.nano { background: #bba; width: 500px; height: 500px; }
.nano .nano-content { padding: 10px; }
.nano .nano-pane { background: #888; }
.nano .nano-slider { background: #111; }
.nano &gt; .nano-content { padding: 10px; }
.nano &gt; .nano-pane { background: #888; }
.nano &gt; .nano-pane &gt; .nano-slider { background: #111; }
</code></pre>
<h3 id="3-javascript">3. JavaScript</h3>
<p>Running this script will apply the nanoScroller plugin to all DOM elements with a <code>.nano</code> className.</p>
Expand Down
7 changes: 4 additions & 3 deletions coffeescripts/jquery.nanoscroller.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,8 @@
# `scrollTop / maxScrollTop = sliderTop / maxSliderTop`
@maxScrollTop = content.scrollHeight - content.clientHeight
@prevScrollTop = @contentScrollTop or 0
@contentScrollTop = content.scrollTop
#Browser sometimes rounds down
@contentScrollTop = content.scrollTop + 1

direction = if @contentScrollTop > @previousPosition
"down"
Expand Down Expand Up @@ -480,7 +481,7 @@
drag: (e) =>
@sliderY = e.pageY - @$el.offset().top - @paneTop - (@offsetY or @sliderHeight * 0.5)
do @scroll
if @contentScrollTop >= @maxScrollTop and @prevScrollTop isnt @maxScrollTop
if @contentScrollTop >= @maxScrollTop and @prevScrollTop isnt @maxScrollTop and @prevScrollTop-1 isnt @maxScrollTop
@$el.trigger 'scrollend'
else if @contentScrollTop is 0 and @prevScrollTop isnt 0
@$el.trigger 'scrolltop'
Expand Down Expand Up @@ -523,7 +524,7 @@
# we dispatch an event.
if @contentScrollTop >= @maxScrollTop
@preventScrolling(e, DOWN) if @options.preventPageScrolling
@$el.trigger 'scrollend' if @prevScrollTop isnt @maxScrollTop
@$el.trigger 'scrollend' if @prevScrollTop isnt @maxScrollTop and @prevScrollTop-1 isnt @maxScrollTop
else if @contentScrollTop is 0
@preventScrolling(e, UP) if @options.preventPageScrolling
@$el.trigger 'scrolltop' if @prevScrollTop isnt 0
Expand Down