From ef2887e0ad045e0783c1324e78699962e59b2662 Mon Sep 17 00:00:00 2001 From: Krister Kari Date: Sat, 11 Apr 2015 22:14:16 +0300 Subject: [PATCH] Bump version to 0.8.6 --- bin/javascripts/jquery.nanoscroller.js | 2 +- bin/javascripts/jquery.nanoscroller.min.js | 2 +- bower.json | 2 +- docs/classes/NanoScroll.html | 106 +++++++++--------- docs/data.json | 104 ++++++++--------- ...in_javascripts_jquery.nanoscroller.js.html | 8 +- docs/index.html | 2 +- nanoscroller.jquery.json | 2 +- package.json | 2 +- 9 files changed, 116 insertions(+), 114 deletions(-) diff --git a/bin/javascripts/jquery.nanoscroller.js b/bin/javascripts/jquery.nanoscroller.js index f6d5d9e..c1b56c9 100644 --- a/bin/javascripts/jquery.nanoscroller.js +++ b/bin/javascripts/jquery.nanoscroller.js @@ -1,4 +1,4 @@ -/*! nanoScrollerJS - v0.8.5 - 2015 +/*! nanoScrollerJS - v0.8.6 - 2015 * http://jamesflorentino.github.com/nanoScrollerJS/ * Copyright (c) 2015 James Florentino; Licensed MIT */ (function(factory) { diff --git a/bin/javascripts/jquery.nanoscroller.min.js b/bin/javascripts/jquery.nanoscroller.min.js index 503aa4c..0100d57 100644 --- a/bin/javascripts/jquery.nanoscroller.min.js +++ b/bin/javascripts/jquery.nanoscroller.min.js @@ -1,4 +1,4 @@ -/*! nanoScrollerJS - v0.8.5 - (c) 2015 James Florentino; Licensed MIT */ +/*! nanoScrollerJS - v0.8.6 - (c) 2015 James Florentino; Licensed MIT */ !function(a){return"function"==typeof define&&define.amd?define(["jquery"],function(b){return a(b,window,document)}):"object"==typeof exports?module.exports=a(require("jquery"),window,document):a(jQuery,window,document)}(function(a,b,c){"use strict";var d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H;z={paneClass:"nano-pane",sliderClass:"nano-slider",contentClass:"nano-content",iOSNativeScrolling:!1,preventPageScrolling:!1,disableResize:!1,alwaysVisible:!1,flashDelay:1500,sliderMinHeight:20,sliderMaxHeight:null,documentContext:null,windowContext:null},u="scrollbar",t="scroll",l="mousedown",m="mouseenter",n="mousemove",p="mousewheel",o="mouseup",s="resize",h="drag",i="enter",w="up",r="panedown",f="DOMMouseScroll",g="down",x="wheel",j="keydown",k="keyup",v="touchmove",d="Microsoft Internet Explorer"===b.navigator.appName&&/msie 7./i.test(b.navigator.appVersion)&&b.ActiveXObject,e=null,D=b.requestAnimationFrame,y=b.cancelAnimationFrame,F=c.createElement("div").style,H=function(){var a,b,c,d,e,f;for(d=["t","webkitT","MozT","msT","OT"],a=e=0,f=d.length;f>e;a=++e)if(c=d[a],b=d[a]+"ransform",b in F)return d[a].substr(0,d[a].length-1);return!1}(),G=function(a){return H===!1?!1:""===H?a:H+a.charAt(0).toUpperCase()+a.substr(1)},E=G("transform"),B=E!==!1,A=function(){var a,b,d;return a=c.createElement("div"),b=a.style,b.position="absolute",b.width="100px",b.height="100px",b.overflow=t,b.top="-9999px",c.body.appendChild(a),d=a.offsetWidth-a.clientWidth,c.body.removeChild(a),d},C=function(){var a,c,d;return c=b.navigator.userAgent,(a=/(?=.+Mac OS X)(?=.+Firefox)/.test(c))?(d=/Firefox\/\d{2}\./.exec(c),d&&(d=d[0].replace(/\D+/g,"")),a&&+d>23):!1},q=function(){function j(d,f){this.el=d,this.options=f,e||(e=A()),this.$el=a(this.el),this.doc=a(this.options.documentContext||c),this.win=a(this.options.windowContext||b),this.body=this.doc.find("body"),this.$content=this.$el.children("."+this.options.contentClass),this.$content.attr("tabindex",this.options.tabIndex||0),this.content=this.$content[0],this.previousPosition=0,this.options.iOSNativeScrolling&&null!=this.el.style.WebkitOverflowScrolling?this.nativeScrolling():this.generate(),this.createEvents(),this.addEvents(),this.reset()}return j.prototype.preventScrolling=function(a,b){if(this.isActive)if(a.type===f)(b===g&&a.originalEvent.detail>0||b===w&&a.originalEvent.detail<0)&&a.preventDefault();else if(a.type===p){if(!a.originalEvent||!a.originalEvent.wheelDelta)return;(b===g&&a.originalEvent.wheelDelta<0||b===w&&a.originalEvent.wheelDelta>0)&&a.preventDefault()}},j.prototype.nativeScrolling=function(){this.$content.css({WebkitOverflowScrolling:"touch"}),this.iOSNativeScrolling=!0,this.isActive=!0},j.prototype.updateScrollValues=function(){var a,b;a=this.content,this.maxScrollTop=a.scrollHeight-a.clientHeight,this.prevScrollTop=this.contentScrollTop||0,this.contentScrollTop=a.scrollTop,b=this.contentScrollTop>this.previousPosition?"down":this.contentScrollTop=a.maxScrollTop&&a.prevScrollTop!==a.maxScrollTop?a.$el.trigger("scrollend"):0===a.contentScrollTop&&0!==a.prevScrollTop&&a.$el.trigger("scrolltop"),!1}}(this),up:function(a){return function(b){return a.isBeingDragged=!1,a.pane.removeClass("active"),a.doc.unbind(n,a.events[h]).unbind(o,a.events[w]),a.body.unbind(m,a.events[i]),!1}}(this),resize:function(a){return function(b){a.reset()}}(this),panedown:function(a){return function(b){return a.sliderY=(b.offsetY||b.originalEvent.layerY)-.5*a.sliderHeight,a.scroll(),a.events.down(b),!1}}(this),scroll:function(a){return function(b){a.updateScrollValues(),a.isBeingDragged||(a.iOSNativeScrolling||(a.sliderY=a.sliderTop,a.setOnScrollStyles()),null!=b&&(a.contentScrollTop>=a.maxScrollTop?(a.options.preventPageScrolling&&a.preventScrolling(b,g),a.prevScrollTop!==a.maxScrollTop&&a.$el.trigger("scrollend")):0===a.contentScrollTop&&(a.options.preventPageScrolling&&a.preventScrolling(b,w),0!==a.prevScrollTop&&a.$el.trigger("scrolltop"))))}}(this),wheel:function(a){return function(b){var c;if(null!=b)return c=b.delta||b.wheelDelta||b.originalEvent&&b.originalEvent.wheelDelta||-b.detail||b.originalEvent&&-b.originalEvent.detail,c&&(a.sliderY+=-c/3),a.scroll(),!1}}(this),enter:function(a){return function(b){var c;if(a.isBeingDragged)return 1!==(b.buttons||b.which)?(c=a.events)[w].apply(c,arguments):void 0}}(this)}},j.prototype.addEvents=function(){var a;this.removeEvents(),a=this.events,this.options.disableResize||this.win.bind(s,a[s]),this.iOSNativeScrolling||(this.slider.bind(l,a[g]),this.pane.bind(l,a[r]).bind(""+p+" "+f,a[x])),this.$content.bind(""+t+" "+p+" "+f+" "+v,a[t])},j.prototype.removeEvents=function(){var a;a=this.events,this.win.unbind(s,a[s]),this.iOSNativeScrolling||(this.slider.unbind(),this.pane.unbind()),this.$content.unbind(""+t+" "+p+" "+f+" "+v,a[t])},j.prototype.generate=function(){var a,c,d,f,g,h,i;return f=this.options,h=f.paneClass,i=f.sliderClass,a=f.contentClass,(g=this.$el.children("."+h)).length||g.children("."+i).length||this.$el.append('
'),this.pane=this.$el.children("."+h),this.slider=this.pane.find("."+i),0===e&&C()?(d=b.getComputedStyle(this.content,null).getPropertyValue("padding-right").replace(/[^0-9.]+/g,""),c={right:-14,paddingRight:+d+14}):e&&(c={right:-e},this.$el.addClass("has-scrollbar")),null!=c&&this.$content.css(c),this},j.prototype.restore=function(){this.stopped=!1,this.iOSNativeScrolling||this.pane.show(),this.addEvents()},j.prototype.reset=function(){var a,b,c,f,g,h,i,j,k,l,m,n;return this.iOSNativeScrolling?void(this.contentHeight=this.content.scrollHeight):(this.$el.find("."+this.options.paneClass).length||this.generate().stop(),this.stopped&&this.restore(),a=this.content,f=a.style,g=f.overflowY,d&&this.$content.css({height:this.$content.height()}),b=a.scrollHeight+e,l=parseInt(this.$el.css("max-height"),10),l>0&&(this.$el.height(""),this.$el.height(a.scrollHeight>l?l:a.scrollHeight)),i=this.pane.outerHeight(!1),k=parseInt(this.pane.css("top"),10),h=parseInt(this.pane.css("bottom"),10),j=i+k+h,n=Math.round(j/b*i),nthis.options.sliderMaxHeight&&(n=this.options.sliderMaxHeight),g===t&&f.overflowX!==t&&(n+=e),this.maxSliderTop=j-n,this.contentHeight=b,this.paneHeight=i,this.paneOuterHeight=j,this.sliderHeight=n,this.paneTop=k,this.slider.height(n),this.events.scroll(),this.pane.show(),this.isActive=!0,a.scrollHeight===a.clientHeight||this.pane.outerHeight(!0)>=a.scrollHeight&&g!==t?(this.pane.hide(),this.isActive=!1):this.el.clientHeight===a.scrollHeight&&g===t?this.slider.hide():this.slider.show(),this.pane.css({opacity:this.options.alwaysVisible?1:"",visibility:this.options.alwaysVisible?"visible":""}),c=this.$content.css("position"),("static"===c||"relative"===c)&&(m=parseInt(this.$content.css("right"),10),m&&this.$content.css({right:"",marginRight:m})),this)},j.prototype.scroll=function(){return this.isActive?(this.sliderY=Math.max(0,this.sliderY),this.sliderY=Math.min(this.maxSliderTop,this.sliderY),this.$content.scrollTop(this.maxScrollTop*this.sliderY/this.maxSliderTop),this.iOSNativeScrolling||(this.updateScrollValues(),this.setOnScrollStyles()),this):void 0},j.prototype.scrollBottom=function(a){return this.isActive?(this.$content.scrollTop(this.contentHeight-this.$content.height()-a).trigger(p),this.stop().restore(),this):void 0},j.prototype.scrollTop=function(a){return this.isActive?(this.$content.scrollTop(+a).trigger(p),this.stop().restore(),this):void 0},j.prototype.scrollTo=function(a){return this.isActive?(this.scrollTop(this.$el.find(a).get(0).offsetTop),this):void 0},j.prototype.stop=function(){return y&&this.scrollRAF&&(y(this.scrollRAF),this.scrollRAF=null),this.stopped=!0,this.removeEvents(),this.iOSNativeScrolling||this.pane.hide(),this},j.prototype.destroy=function(){return this.stopped||this.stop(),!this.iOSNativeScrolling&&this.pane.length&&this.pane.remove(),d&&this.$content.height(""),this.$content.removeAttr("tabindex"),this.$el.hasClass("has-scrollbar")&&(this.$el.removeClass("has-scrollbar"),this.$content.css({right:""})),this},j.prototype.flash=function(){return!this.iOSNativeScrolling&&this.isActive?(this.reset(),this.pane.addClass("flashed"),setTimeout(function(a){return function(){a.pane.removeClass("flashed")}}(this),this.options.flashDelay),this):void 0},j}(),a.fn.nanoScroller=function(b){return this.each(function(){var c,d;if((d=this.nanoscroller)||(c=a.extend({},z,b),this.nanoscroller=d=new q(this,c)),b&&"object"==typeof b){if(a.extend(d.options,b),null!=b.scrollBottom)return d.scrollBottom(b.scrollBottom);if(null!=b.scrollTop)return d.scrollTop(b.scrollTop);if(b.scrollTo)return d.scrollTo(b.scrollTo);if("bottom"===b.scroll)return d.scrollBottom(0);if("top"===b.scroll)return d.scrollTop(0);if(b.scroll&&b.scroll instanceof a)return d.scrollTo(b.scroll);if(b.stop)return d.stop();if(b.destroy)return d.destroy();if(b.flash)return d.flash()}return d.reset()})},a.fn.nanoScroller.Constructor=q}); //# sourceMappingURL=jquery.nanoscroller.min.js.map \ No newline at end of file diff --git a/bower.json b/bower.json index f506b9a..52d50d8 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "nanoscroller", - "version": "0.8.5", + "version": "0.8.6", "description": "A jQuery plugin that offers a simplistic way of implementing Lion OS scrollbars.", "homepage": "http://jamesflorentino.github.com/nanoScrollerJS/", "main": [ diff --git a/docs/classes/NanoScroll.html b/docs/classes/NanoScroll.html index 1aa236f..b6677ff 100644 --- a/docs/classes/NanoScroll.html +++ b/docs/classes/NanoScroll.html @@ -19,7 +19,7 @@

- API Docs for: 0.8.5 + API Docs for: 0.8.6
@@ -90,7 +90,7 @@

NanoScroll Class

@@ -156,7 +156,7 @@

NanoScroll

- bin/javascripts/jquery.nanoscroller.js:352 + bin/javascripts/jquery.nanoscroller.js:354

@@ -686,7 +686,7 @@

addEvents

- bin/javascripts/jquery.nanoscroller.js:601 + bin/javascripts/jquery.nanoscroller.js:603

@@ -743,7 +743,7 @@

createEvents

- bin/javascripts/jquery.nanoscroller.js:487 + bin/javascripts/jquery.nanoscroller.js:489

@@ -800,7 +800,7 @@

destroy

- bin/javascripts/jquery.nanoscroller.js:873 + bin/javascripts/jquery.nanoscroller.js:875

@@ -866,7 +866,7 @@

flash

- bin/javascripts/jquery.nanoscroller.js:902 + bin/javascripts/jquery.nanoscroller.js:904

@@ -935,7 +935,7 @@

generate

- bin/javascripts/jquery.nanoscroller.js:640 + bin/javascripts/jquery.nanoscroller.js:642

@@ -998,7 +998,7 @@

getBrowserScrollbarWidth

- bin/javascripts/jquery.nanoscroller.js:317 + bin/javascripts/jquery.nanoscroller.js:319

@@ -1069,7 +1069,7 @@

nativeScrolling

- bin/javascripts/jquery.nanoscroller.js:410 + bin/javascripts/jquery.nanoscroller.js:412

@@ -1142,7 +1142,7 @@

preventScrolling

- bin/javascripts/jquery.nanoscroller.js:382 + bin/javascripts/jquery.nanoscroller.js:384

@@ -1239,7 +1239,7 @@

removeEvents

- bin/javascripts/jquery.nanoscroller.js:622 + bin/javascripts/jquery.nanoscroller.js:624

@@ -1296,7 +1296,7 @@

reset

- bin/javascripts/jquery.nanoscroller.js:689 + bin/javascripts/jquery.nanoscroller.js:691

@@ -1362,7 +1362,7 @@

restore

- bin/javascripts/jquery.nanoscroller.js:675 + bin/javascripts/jquery.nanoscroller.js:677

@@ -1418,7 +1418,7 @@

scroll

- bin/javascripts/jquery.nanoscroller.js:772 + bin/javascripts/jquery.nanoscroller.js:774

@@ -1493,7 +1493,7 @@

scrollBottom

- bin/javascripts/jquery.nanoscroller.js:794 + bin/javascripts/jquery.nanoscroller.js:796

@@ -1592,7 +1592,7 @@

scrollTo

- bin/javascripts/jquery.nanoscroller.js:832 + bin/javascripts/jquery.nanoscroller.js:834

@@ -1692,7 +1692,7 @@

scrollTop

- bin/javascripts/jquery.nanoscroller.js:813 + bin/javascripts/jquery.nanoscroller.js:815

@@ -1781,7 +1781,7 @@

setOnScrollStyles

- bin/javascripts/jquery.nanoscroller.js:454 + bin/javascripts/jquery.nanoscroller.js:456

@@ -1839,7 +1839,7 @@

stop

- bin/javascripts/jquery.nanoscroller.js:850 + bin/javascripts/jquery.nanoscroller.js:852

@@ -1906,7 +1906,7 @@

updateScrollValues

- bin/javascripts/jquery.nanoscroller.js:425 + bin/javascripts/jquery.nanoscroller.js:427

@@ -1961,7 +1961,7 @@

alwaysVisible

- bin/javascripts/jquery.nanoscroller.js:66 + bin/javascripts/jquery.nanoscroller.js:68

@@ -2014,7 +2014,7 @@

BROWSER_IS_IE7

- bin/javascripts/jquery.nanoscroller.js:273 + bin/javascripts/jquery.nanoscroller.js:275

@@ -2062,7 +2062,7 @@

BROWSER_SCROLLBAR_WIDTH

- bin/javascripts/jquery.nanoscroller.js:282 + bin/javascripts/jquery.nanoscroller.js:284

@@ -2108,7 +2108,7 @@

contentClass

- bin/javascripts/jquery.nanoscroller.js:33 + bin/javascripts/jquery.nanoscroller.js:35

@@ -2155,7 +2155,7 @@

disableResize

- bin/javascripts/jquery.nanoscroller.js:58 + bin/javascripts/jquery.nanoscroller.js:60

@@ -2202,7 +2202,7 @@

documentContext

- bin/javascripts/jquery.nanoscroller.js:98 + bin/javascripts/jquery.nanoscroller.js:100

@@ -2255,7 +2255,7 @@

DOMSCROLL

- bin/javascripts/jquery.nanoscroller.js:219 + bin/javascripts/jquery.nanoscroller.js:221

@@ -2305,7 +2305,7 @@

DOWN

- bin/javascripts/jquery.nanoscroller.js:228 + bin/javascripts/jquery.nanoscroller.js:230

@@ -2355,7 +2355,7 @@

DRAG

- bin/javascripts/jquery.nanoscroller.js:183 + bin/javascripts/jquery.nanoscroller.js:185

@@ -2405,7 +2405,7 @@

ENTER

- bin/javascripts/jquery.nanoscroller.js:192 + bin/javascripts/jquery.nanoscroller.js:194

@@ -2449,7 +2449,7 @@

flashDelay

- bin/javascripts/jquery.nanoscroller.js:74 + bin/javascripts/jquery.nanoscroller.js:76

@@ -2496,7 +2496,7 @@

iOSNativeScrolling

- bin/javascripts/jquery.nanoscroller.js:41 + bin/javascripts/jquery.nanoscroller.js:43

@@ -2549,7 +2549,7 @@

KEYDOWN

- bin/javascripts/jquery.nanoscroller.js:246 + bin/javascripts/jquery.nanoscroller.js:248

@@ -2599,7 +2599,7 @@

KEYUP

- bin/javascripts/jquery.nanoscroller.js:255 + bin/javascripts/jquery.nanoscroller.js:257

@@ -2647,7 +2647,7 @@

MOUSEDOWN

- bin/javascripts/jquery.nanoscroller.js:133 + bin/javascripts/jquery.nanoscroller.js:135

@@ -2695,7 +2695,7 @@

MOUSEENTER

- bin/javascripts/jquery.nanoscroller.js:141 + bin/javascripts/jquery.nanoscroller.js:143

@@ -2745,7 +2745,7 @@

MOUSEMOVE

- bin/javascripts/jquery.nanoscroller.js:149 + bin/javascripts/jquery.nanoscroller.js:151

@@ -2795,7 +2795,7 @@

MOUSEUP

- bin/javascripts/jquery.nanoscroller.js:166 + bin/javascripts/jquery.nanoscroller.js:168

@@ -2843,7 +2843,7 @@

MOUSEWHEEL

- bin/javascripts/jquery.nanoscroller.js:158 + bin/javascripts/jquery.nanoscroller.js:160

@@ -2887,7 +2887,7 @@

paneClass

- bin/javascripts/jquery.nanoscroller.js:17 + bin/javascripts/jquery.nanoscroller.js:19

@@ -2940,7 +2940,7 @@

PANEDOWN

- bin/javascripts/jquery.nanoscroller.js:210 + bin/javascripts/jquery.nanoscroller.js:212

@@ -2984,7 +2984,7 @@

preventPageScrolling

- bin/javascripts/jquery.nanoscroller.js:49 + bin/javascripts/jquery.nanoscroller.js:51

@@ -3036,7 +3036,7 @@

RESIZE

- bin/javascripts/jquery.nanoscroller.js:175 + bin/javascripts/jquery.nanoscroller.js:177

@@ -3086,7 +3086,7 @@

SCROLL

- bin/javascripts/jquery.nanoscroller.js:124 + bin/javascripts/jquery.nanoscroller.js:126

@@ -3136,7 +3136,7 @@

SCROLLBAR

- bin/javascripts/jquery.nanoscroller.js:115 + bin/javascripts/jquery.nanoscroller.js:117

@@ -3180,7 +3180,7 @@

sliderClass

- bin/javascripts/jquery.nanoscroller.js:25 + bin/javascripts/jquery.nanoscroller.js:27

@@ -3227,7 +3227,7 @@

sliderMaxHeight

- bin/javascripts/jquery.nanoscroller.js:90 + bin/javascripts/jquery.nanoscroller.js:92

@@ -3274,7 +3274,7 @@

sliderMinHeight

- bin/javascripts/jquery.nanoscroller.js:82 + bin/javascripts/jquery.nanoscroller.js:84

@@ -3327,7 +3327,7 @@

TOUCHMOVE

- bin/javascripts/jquery.nanoscroller.js:264 + bin/javascripts/jquery.nanoscroller.js:266

@@ -3377,7 +3377,7 @@

UP

- bin/javascripts/jquery.nanoscroller.js:201 + bin/javascripts/jquery.nanoscroller.js:203

@@ -3427,7 +3427,7 @@

WHEEL

- bin/javascripts/jquery.nanoscroller.js:237 + bin/javascripts/jquery.nanoscroller.js:239

@@ -3471,7 +3471,7 @@

windowContext

- bin/javascripts/jquery.nanoscroller.js:106 + bin/javascripts/jquery.nanoscroller.js:108

diff --git a/docs/data.json b/docs/data.json index 7fbdc43..1faf2da 100644 --- a/docs/data.json +++ b/docs/data.json @@ -2,7 +2,7 @@ "project": { "name": "jquery.nanoscroller", "description": "A jQuery plugin that offers a simplistic way of implementing Lion OS scrollbars.", - "version": "0.8.5", + "version": "0.8.6", "url": "http://jamesflorentino.github.com/nanoScrollerJS/" }, "files": { @@ -27,7 +27,7 @@ "plugin_for": [], "extension_for": [], "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 352, + "line": 354, "params": [ { "name": "element", @@ -46,7 +46,7 @@ "classitems": [ { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 17, + "line": 19, "description": "a classname for the pane element.", "itemtype": "property", "name": "paneClass", @@ -56,7 +56,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 25, + "line": 27, "description": "a classname for the slider element.", "itemtype": "property", "name": "sliderClass", @@ -66,7 +66,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 33, + "line": 35, "description": "a classname for the content element.", "itemtype": "property", "name": "contentClass", @@ -76,7 +76,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 41, + "line": 43, "description": "a setting to enable native scrolling in iOS devices.", "itemtype": "property", "name": "iOSNativeScrolling", @@ -86,7 +86,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 49, + "line": 51, "description": "a setting to prevent the rest of the page being\nscrolled when user scrolls the `.content` element.", "itemtype": "property", "name": "preventPageScrolling", @@ -96,7 +96,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 58, + "line": 60, "description": "a setting to disable binding to the resize event.", "itemtype": "property", "name": "disableResize", @@ -106,7 +106,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 66, + "line": 68, "description": "a setting to make the scrollbar always visible.", "itemtype": "property", "name": "alwaysVisible", @@ -116,7 +116,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 74, + "line": 76, "description": "a default timeout for the `flash()` method.", "itemtype": "property", "name": "flashDelay", @@ -126,7 +126,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 82, + "line": 84, "description": "a minimum height for the `.slider` element.", "itemtype": "property", "name": "sliderMinHeight", @@ -136,7 +136,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 90, + "line": 92, "description": "a maximum height for the `.slider` element.", "itemtype": "property", "name": "sliderMaxHeight", @@ -146,7 +146,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 98, + "line": 100, "description": "an alternate document context.", "itemtype": "property", "name": "documentContext", @@ -156,7 +156,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 106, + "line": 108, "description": "an alternate window context.", "itemtype": "property", "name": "windowContext", @@ -166,7 +166,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 115, + "line": 117, "itemtype": "property", "name": "SCROLLBAR", "type": "String", @@ -178,7 +178,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 124, + "line": 126, "itemtype": "property", "name": "SCROLL", "type": "String", @@ -190,7 +190,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 133, + "line": 135, "itemtype": "property", "name": "MOUSEDOWN", "type": "String", @@ -201,7 +201,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 141, + "line": 143, "itemtype": "property", "name": "MOUSEENTER", "type": "String", @@ -212,7 +212,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 149, + "line": 151, "itemtype": "property", "name": "MOUSEMOVE", "type": "String", @@ -224,7 +224,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 158, + "line": 160, "itemtype": "property", "name": "MOUSEWHEEL", "type": "String", @@ -235,7 +235,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 166, + "line": 168, "itemtype": "property", "name": "MOUSEUP", "type": "String", @@ -247,7 +247,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 175, + "line": 177, "itemtype": "property", "name": "RESIZE", "type": "String", @@ -258,7 +258,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 183, + "line": 185, "itemtype": "property", "name": "DRAG", "type": "String", @@ -270,7 +270,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 192, + "line": 194, "itemtype": "property", "name": "ENTER", "type": "String", @@ -282,7 +282,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 201, + "line": 203, "itemtype": "property", "name": "UP", "type": "String", @@ -294,7 +294,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 210, + "line": 212, "itemtype": "property", "name": "PANEDOWN", "type": "String", @@ -306,7 +306,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 219, + "line": 221, "itemtype": "property", "name": "DOMSCROLL", "type": "String", @@ -318,7 +318,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 228, + "line": 230, "itemtype": "property", "name": "DOWN", "type": "String", @@ -330,7 +330,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 237, + "line": 239, "itemtype": "property", "name": "WHEEL", "type": "String", @@ -342,7 +342,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 246, + "line": 248, "itemtype": "property", "name": "KEYDOWN", "type": "String", @@ -354,7 +354,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 255, + "line": 257, "itemtype": "property", "name": "KEYUP", "type": "String", @@ -366,7 +366,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 264, + "line": 266, "itemtype": "property", "name": "TOUCHMOVE", "type": "String", @@ -378,7 +378,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 273, + "line": 275, "itemtype": "property", "name": "BROWSER_IS_IE7", "type": "Boolean", @@ -390,7 +390,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 282, + "line": 284, "itemtype": "property", "name": "BROWSER_SCROLLBAR_WIDTH", "type": "Number", @@ -402,7 +402,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 317, + "line": 319, "description": "Returns browser's native scrollbar width", "itemtype": "method", "name": "getBrowserScrollbarWidth", @@ -417,7 +417,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 382, + "line": 384, "description": "Prevents the rest of the page being scrolled\nwhen user scrolls the `.nano-content` element.", "itemtype": "method", "name": "preventScrolling", @@ -439,7 +439,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 410, + "line": 412, "description": "Enable iOS native scrolling", "itemtype": "method", "name": "nativeScrolling", @@ -449,7 +449,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 425, + "line": 427, "description": "Updates those nanoScroller properties that\nare related to current scrollbar position.", "itemtype": "method", "name": "updateScrollValues", @@ -459,7 +459,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 454, + "line": 456, "description": "Updates CSS styles for current scroll position.\nUses CSS 2d transfroms and `window.requestAnimationFrame` if available.", "itemtype": "method", "name": "setOnScrollStyles", @@ -469,7 +469,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 487, + "line": 489, "description": "Creates event related methods", "itemtype": "method", "name": "createEvents", @@ -479,7 +479,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 601, + "line": 603, "description": "Adds event listeners with jQuery.", "itemtype": "method", "name": "addEvents", @@ -489,7 +489,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 622, + "line": 624, "description": "Removes event listeners with jQuery.", "itemtype": "method", "name": "removeEvents", @@ -499,7 +499,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 640, + "line": 642, "description": "Generates nanoScroller's scrollbar and elements for it.", "itemtype": "method", "name": "generate", @@ -510,7 +510,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 675, + "line": 677, "itemtype": "method", "name": "restore", "access": "private", @@ -519,7 +519,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 689, + "line": 691, "description": "Resets nanoScroller's scrollbar.", "itemtype": "method", "name": "reset", @@ -531,7 +531,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 772, + "line": 774, "itemtype": "method", "name": "scroll", "access": "private", @@ -543,7 +543,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 794, + "line": 796, "description": "Scroll at the bottom with an offset value", "itemtype": "method", "name": "scrollBottom", @@ -562,7 +562,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 813, + "line": 815, "description": "Scroll at the top with an offset value", "itemtype": "method", "name": "scrollTop", @@ -581,7 +581,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 832, + "line": 834, "description": "Scroll to an element", "itemtype": "method", "name": "scrollTo", @@ -600,7 +600,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 850, + "line": 852, "description": "To stop the operation.\nThis option will tell the plugin to disable all event bindings and hide the gadget scrollbar from the UI.", "itemtype": "method", "name": "stop", @@ -612,7 +612,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 873, + "line": 875, "description": "Destroys nanoScroller and restores browser's native scrollbar.", "itemtype": "method", "name": "destroy", @@ -624,7 +624,7 @@ }, { "file": "bin/javascripts/jquery.nanoscroller.js", - "line": 902, + "line": 904, "description": "To flash the scrollbar gadget for an amount of time defined in plugin settings (defaults to 1,5s).\nUseful if you want to show the user (e.g. on pageload) that there is more content waiting for him.", "itemtype": "method", "name": "flash", diff --git a/docs/files/bin_javascripts_jquery.nanoscroller.js.html b/docs/files/bin_javascripts_jquery.nanoscroller.js.html index 7ff1e8e..9b98ef6 100644 --- a/docs/files/bin_javascripts_jquery.nanoscroller.js.html +++ b/docs/files/bin_javascripts_jquery.nanoscroller.js.html @@ -19,7 +19,7 @@

- API Docs for: 0.8.5 + API Docs for: 0.8.6
@@ -86,7 +86,7 @@

File: bin/javascripts/jquery.nanoscroller.js

-/*! nanoScrollerJS - v0.8.5 - 2015
+/*! nanoScrollerJS - v0.8.6 - 2015
 * http://jamesflorentino.github.com/nanoScrollerJS/
 * Copyright (c) 2015 James Florentino; Licensed MIT */
 (function(factory) {
@@ -94,6 +94,8 @@ 

File: bin/javascripts/jquery.nanoscroller.js

return define(['jquery'], function($) { return factory($, window, document); }); + } else if (typeof exports === 'object') { + return module.exports = factory(require('jquery'), window, document); } else { return factory(jQuery, window, document); } @@ -812,7 +814,7 @@

File: bin/javascripts/jquery.nanoscroller.js

paneTop = parseInt(this.pane.css('top'), 10); paneBottom = parseInt(this.pane.css('bottom'), 10); paneOuterHeight = paneHeight + paneTop + paneBottom; - sliderHeight = Math.round(paneOuterHeight / contentHeight * paneOuterHeight); + sliderHeight = Math.round(paneOuterHeight / contentHeight * paneHeight); if (sliderHeight < this.options.sliderMinHeight) { sliderHeight = this.options.sliderMinHeight; } else if ((this.options.sliderMaxHeight != null) && sliderHeight > this.options.sliderMaxHeight) { diff --git a/docs/index.html b/docs/index.html index bcc9d2a..e6bcba5 100644 --- a/docs/index.html +++ b/docs/index.html @@ -19,7 +19,7 @@

- API Docs for: 0.8.5 + API Docs for: 0.8.6
diff --git a/nanoscroller.jquery.json b/nanoscroller.jquery.json index bef6ab3..8e02acf 100644 --- a/nanoscroller.jquery.json +++ b/nanoscroller.jquery.json @@ -2,7 +2,7 @@ "name": "jquery.nanoscroller", "title": "nanoScrollerJS", "description": "A jQuery plugin that offers a simplistic way of implementing Lion OS scrollbars.", - "version": "0.8.5", + "version": "0.8.6", "homepage": "http://jamesflorentino.github.com/nanoScrollerJS/", "author": { "name": "James Florentino", diff --git a/package.json b/package.json index dc4147b..290722b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nanoscroller", "description": "A jQuery plugin that offers a simplistic way of implementing Lion OS scrollbars.", - "version": "0.8.5", + "version": "0.8.6", "author": "James Florentino (http://blog.jamesflorentino.com/)", "bugs": { "url": "https://github.com/jamesflorentino/nanoScrollerJS/issues"