Skip to content

Commit

Permalink
3.6.6 - some fixes and updates
Browse files Browse the repository at this point in the history
- allow horizrailenabled false and timeout issue #479
- allow left rail
offset for left aligned scroll bars #483
- Fixed issue of shifting
cursor in textarea #507
- Angular added #510
- Remove moot `version`
property from bower.json #517
- Background Parallax Fix #518
-
Browserify and Node/CommonJS support. #534
- Reset checkarea for mouse
wheel event when the mouse moved #537
- Fixing nicescroll visibility
inside Modal #544
- nice scroll version 3.6.0 mouse wheel not working on
safari 5.1.7 #490
- Cannot assign to read only property 'scrollable' of
false on Chrome when horizrailenabled flase #461
- delaylist null error
on hidding element #260
- horizrailenabled: false is broken #523
  • Loading branch information
inuyaksa committed Nov 17, 2015
1 parent 2dacf20 commit f599466
Show file tree
Hide file tree
Showing 7 changed files with 375 additions and 368 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#jQuery.NiceScroll
v. 3.6.5 11-17-2015
v. 3.6.6 11-17-2015

- [Web Site: nicescroll.areaaperta.com](http://nicescroll.areaaperta.com)
- [Repo: github.com/inuyaksa/jquery.nicescroll](https://github.com/inuyaksa/jquery.nicescroll)
Expand Down
13 changes: 10 additions & 3 deletions changelog_3.6.5.txt → changelog_3.6.6.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
Changelog nicescroll release 3.6.5
Changelog nicescroll release 3.6.6
http://nicescroll.areaaperta.com/
https://github.com/inuyaksa/jquery.nicescroll


New options
none


Changed features
none

Fixes
- allow horizrailenabled false and timeout issue #479
- allow horizrailenabled false and timeout issue #479
- allow left rail offset for left aligned scroll bars #483
- Fixed issue of shifting cursor in textarea #507
- Angular added #510
Expand All @@ -20,6 +19,10 @@ Fixes
- Browserify and Node/CommonJS support. #534
- Reset checkarea for mouse wheel event when the mouse moved #537
- Fixing nicescroll visibility inside Modal #544
- nice scroll version 3.6.0 mouse wheel not working on safari 5.1.7 #490
- Cannot assign to read only property 'scrollable' of false on Chrome when horizrailenabled flase #461
- delaylist null error on hidding element #260
- horizrailenabled: false is broken #523


Thanks to great contributors!!
Expand All @@ -32,6 +35,10 @@ kkirsche
duckzland
bnadeau
abhi05b
krishnareddy668
creativform
PlippiePlop
abou7mied



Expand Down
236 changes: 118 additions & 118 deletions demo/js/jquery.nicescroll.min.js

Large diffs are not rendered by default.

236 changes: 118 additions & 118 deletions dist/jquery.nicescroll.min.js

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions jquery.nicescroll.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* jquery.nicescroll
-- version 3.6.5
-- version 3.6.6
-- copyright 2015-11-17 InuYaksa*2015
-- licensed under the MIT
--
Expand Down Expand Up @@ -136,6 +136,7 @@
d.isie9 = d.isie && ("performance" in window) && (document.documentMode >= 9);
d.isie10 = d.isie && ("performance" in window) && (document.documentMode == 10);
d.isie11 = ("msRequestFullscreen" in _el) && (document.documentMode >= 11); // IE11+
d.isieedge = (navigator.userAgent.match(/Edge\/12\./));

d.isie9mobile = /iemobile.9/i.test(_agent); //wp 7.1 mango
if (d.isie9mobile) d.isie9 = false;
Expand All @@ -151,7 +152,7 @@

d.cantouch = ("ontouchstart" in document.documentElement) || ("ontouchstart" in window); // detection for Chrome Touch Emulation
d.hasmstouch = (window.MSPointerEvent || false); // IE10 pointer events
d.hasw3ctouch = (window.PointerEvent || false); //IE11 pointer events, following W3C Pointer Events spec
d.hasw3ctouch = (window.PointerEvent || false) && ((navigator.MaxTouchPoints > 0)||(navigator.msMaxTouchPoints > 0)); //IE11 pointer events, following W3C Pointer Events spec

d.ismac = /^mac$/i.test(_platform);

Expand Down Expand Up @@ -231,7 +232,7 @@

var self = this;

this.version = '3.6.5';
this.version = '3.6.6';
this.name = 'nicescroll';

this.me = me;
Expand Down Expand Up @@ -388,6 +389,7 @@
self.delaylist[name] = fn;
if (!dd) {
self.debouncedelayed = setTimeout(function() {
if (!self) return;
var fn = self.delaylist[name];
self.delaylist[name] = false;
fn.call(self);
Expand Down Expand Up @@ -2194,7 +2196,7 @@
self.scrollratio.y = 0;
self.cursorheight = 0;
self.setScrollTop(0);
self.rail.scrollable = false;
if (self.rail) self.rail.scrollable = false;
} else {
self.page.maxh -= (self.opt.railpadding.top + self.opt.railpadding.bottom); //**
self.rail.scrollable = true;
Expand All @@ -2212,9 +2214,7 @@
}
} else {
self.page.maxw -= (self.opt.railpadding.left + self.opt.railpadding.right); //**
if (self.railh) {
self.railh.scrollable = true;
}
if (self.railh) self.railh.scrollable = (self.opt.horizrailenabled);
}

self.railslocked = (self.locked) || ((self.page.maxh == 0) && (self.page.maxw == 0));
Expand All @@ -2226,7 +2226,7 @@
if (!self.hidden && !self.visibility) {
self.showRail().showRailHr();
}
else if (!self.hidden && !self.railh.visibility) self.showRailHr();
else if (self.railh && (!self.hidden && !self.railh.visibility)) self.showRailHr();

if (self.istextarea && self.win.css('resize') && self.win.css('resize') != 'none') self.view.h -= 20;

Expand Down Expand Up @@ -2326,7 +2326,7 @@
var el = ("jquery" in dom) ? dom[0] : dom;

if (name == 'mousewheel') {
if (window.addEventListener||'onwheel' in document) { // modern brosers & IE9 detection fix
if ("onwheel" in self.win) { // modern brosers & IE9 detection fix
self._bind(el, "wheel", fn, bubble || false);
} else {
var wname = (typeof document.onmousewheel != "undefined") ? "mousewheel" : "DOMMouseScroll"; // older IE/Firefox
Expand Down
Loading

0 comments on commit f599466

Please sign in to comment.