Skip to content
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

Remove ie7 margin #328

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

Remove ie7 margin #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9493905
Applying hover class to scroll element on hover instead of using css …
juriejan Jun 3, 2015
b75077b
Merge branch 'master' into hover-class
juriejan Jun 21, 2015
98bb41d
More specific add/remove for hover class
juriejan Jun 21, 2015
b2b5895
Always set horizontal scrolling to 0
juriejan Aug 17, 2015
dcdb7f8
Merge branch 'prevent-horizontal-scroll' into sherpa-master
juriejan Aug 17, 2015
3b3ce90
Merged build
juriejan Aug 17, 2015
28ad5bb
Remove IE7 margin
trobbertze Oct 12, 2016
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
2 changes: 1 addition & 1 deletion bin/css/nanoscroller.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
}
}

.@{nanoClass}:hover > .@{paneClass},
.@{nanoClass}.hover > .@{paneClass},
.@{paneClass}.active,
.@{paneClass}.flashed {
/* Target only IE7 and IE8 with this hack */
Expand Down
32 changes: 24 additions & 8 deletions bin/javascripts/jquery.nanoscroller.js
View file
Open in desktop

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
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions bin/javascripts/jquery.nanoscroller.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bin/javascripts/jquery.nanoscroller.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions bin/readme.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,21 @@ <h4 id="contentclass">contentClass</h4>
<p><strong>Default:</strong> &#39;nano-content&#39;</p>
<pre><code class="lang-js">$(&quot;.nano&quot;).nanoScroller({ contentClass: &#39;sliderContent&#39; });
</code></pre>
<h4 id="enabledclass">enabledClass</h4>
<p>A classname for scrollbar enabled mode. If you change this setting, you also have to change it in the plugin&#39;s CSS file.</p>
<p><strong>Default:</strong> &#39;has-scrollbar&#39;</p>
<pre><code class="lang-js">$(&quot;.nano&quot;).nanoScroller({ enabledClass: &#39;__enabled&#39; });
</code></pre>
<h4 id="flashedclass">flashedClass</h4>
<p>A classname for scrollbar flashed mode. If you change this setting, you also have to change it in the plugin&#39;s CSS file.</p>
<p><strong>Default:</strong> &#39;flashed&#39;</p>
<pre><code class="lang-js">$(&quot;.nano&quot;).nanoScroller({ flashedClass: &#39;__flashed&#39; });
</code></pre>
<h4 id="activeclass">activeClass</h4>
<p>A classname for scrollbar active mode. If you change this setting, you also have to change it in the plugin&#39;s CSS file.</p>
<p><strong>Default:</strong> &#39;active&#39;</p>
<pre><code class="lang-js">$(&quot;.nano&quot;).nanoScroller({ activeClass: &#39;__active&#39; });
</code></pre>
<h4 id="tabindex">tabIndex</h4>
<p>Set the tab order of the scrollable content. Set to -1 to skip over the scrollable content when tabbing.</p>
<p><strong>Default:</strong> 0</p>
Expand Down
23 changes: 22 additions & 1 deletion coffeescripts/jquery.nanoscroller.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,14 @@
###
MOUSEENTER = 'mouseenter'

###*
@property MOUSELEAVE
@type String
@final
@private
###
MOUSELEAVE = 'mouseleave'

###*
@property MOUSEMOVE
@type String
Expand Down Expand Up @@ -440,6 +448,10 @@
###
updateScrollValues: ->
content = @content

# Prevent horizontal scrolling
content.scrollLeft = 0

# Formula/ratio
# `scrollTop / maxScrollTop = sliderTop / maxSliderTop`
@maxScrollTop = content.scrollHeight - content.clientHeight
Expand Down Expand Up @@ -567,6 +579,12 @@
return unless @isBeingDragged
@events[UP] arguments... if (e.buttons or e.which) isnt 1

mouseenter: (e) =>
@$el.addClass('hover')

mouseleave: (e) =>
@$el.removeClass('hover')

return

###*
Expand All @@ -588,6 +606,8 @@
.bind("#{MOUSEWHEEL} #{DOMSCROLL}", events[WHEEL])
@$content
.bind("#{SCROLL} #{MOUSEWHEEL} #{DOMSCROLL} #{TOUCHMOVE}", events[SCROLL])
.bind(MOUSEENTER, events[MOUSEENTER])
.bind(MOUSELEAVE, events[MOUSELEAVE])
return

###*
Expand All @@ -604,6 +624,8 @@
do @pane.unbind
@$content
.unbind("#{SCROLL} #{MOUSEWHEEL} #{DOMSCROLL} #{TOUCHMOVE}", events[SCROLL])
.unbind(MOUSEENTER, events[MOUSEENTER])
.unbind(MOUSELEAVE, events[MOUSELEAVE])
return

###*
Expand Down Expand Up @@ -632,7 +654,6 @@
right: -14
paddingRight: +currentPadding + 14
else if BROWSER_SCROLLBAR_WIDTH
cssRule = right: -BROWSER_SCROLLBAR_WIDTH
@$el.addClass options.enabledClass

@$content.css cssRule if cssRule?
Expand Down