From 937463cf75e82b9ad81504645c1104b6a1255995 Mon Sep 17 00:00:00 2001 From: Hyunje Alex Jun Date: Wed, 24 Sep 2014 19:35:43 +0100 Subject: [PATCH] Change name. --- README.md | 2 +- bower.json | 2 +- min/perfect-scrollbar.min.css | 2 +- min/perfect-scrollbar.min.js | 2 +- perfect-scrollbar.jquery.json | 4 ++-- src/perfect-scrollbar.js | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 4015944..3654f34 100644 --- a/README.md +++ b/README.md @@ -200,7 +200,7 @@ If you have any idea to improve this project or any problem using this, please f License ------- -The MIT License (MIT) Copyright (c) 2012, 2014 Hyeonje Alex Jun and other contributors. +The MIT License (MIT) Copyright (c) 2012, 2014 Hyunje Alex Jun and other contributors. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/bower.json b/bower.json index e917b2e..cc6952a 100644 --- a/bower.json +++ b/bower.json @@ -3,7 +3,7 @@ "version": "0.5.1", "homepage": "http://noraesae.github.io/perfect-scrollbar/", "authors": [ - "Hyeonje Alex Jun " + "Hyunje Alex Jun " ], "description": "Tiny but perfect jQuery scrollbar plugin", "main": [ diff --git a/min/perfect-scrollbar.min.css b/min/perfect-scrollbar.min.css index 4d83d78..4c78d7a 100644 --- a/min/perfect-scrollbar.min.css +++ b/min/perfect-scrollbar.min.css @@ -1,5 +1,5 @@ /*! perfect-scrollbar - v0.5.1 * http://noraesae.github.com/perfect-scrollbar/ -* Copyright (c) 2014 Hyeonje Alex Jun; Licensed MIT */ +* Copyright (c) 2014 Hyunje Alex Jun; Licensed MIT */ .ps-container .ps-scrollbar-x-rail{position:absolute;bottom:3px;height:8px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;opacity:0;filter:alpha(opacity=0);-o-transition:background-color .2s linear,opacity .2s linear;-webkit-transition:background-color .2s linear,opacity .2s linear;-moz-transition:background-color .2s linear,opacity .2s linear;transition:background-color .2s linear,opacity .2s linear}.ps-container:hover .ps-scrollbar-x-rail,.ps-container.hover .ps-scrollbar-x-rail{opacity:.6;filter:alpha(opacity=60)}.ps-container .ps-scrollbar-x-rail:hover,.ps-container .ps-scrollbar-x-rail.hover{background-color:#eee;opacity:.9;filter:alpha(opacity=90)}.ps-container .ps-scrollbar-x-rail.in-scrolling{background-color:#eee;opacity:.9;filter:alpha(opacity=90)}.ps-container .ps-scrollbar-y-rail{position:absolute;right:3px;width:8px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;opacity:0;filter:alpha(opacity=0);-o-transition:background-color .2s linear,opacity .2s linear;-webkit-transition:background-color .2s linear,opacity .2s linear;-moz-transition:background-color .2s linear,opacity .2s linear;transition:background-color .2s linear,opacity .2s linear}.ps-container:hover .ps-scrollbar-y-rail,.ps-container.hover .ps-scrollbar-y-rail{opacity:.6;filter:alpha(opacity=60)}.ps-container .ps-scrollbar-y-rail:hover,.ps-container .ps-scrollbar-y-rail.hover{background-color:#eee;opacity:.9;filter:alpha(opacity=90)}.ps-container .ps-scrollbar-y-rail.in-scrolling{background-color:#eee;opacity:.9;filter:alpha(opacity=90)}.ps-container .ps-scrollbar-x{position:absolute;bottom:0;height:8px;background-color:#aaa;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-o-transition:background-color .2s linear;-webkit-transition:background-color.2s linear;-moz-transition:background-color .2s linear;transition:background-color .2s linear}.ps-container.ie6 .ps-scrollbar-x{font-size:0}.ps-container .ps-scrollbar-x-rail:hover .ps-scrollbar-x,.ps-container .ps-scrollbar-x-rail.hover .ps-scrollbar-x{background-color:#999}.ps-container .ps-scrollbar-y{position:absolute;right:0;width:8px;background-color:#aaa;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-o-transition:background-color .2s linear;-webkit-transition:background-color.2s linear;-moz-transition:background-color .2s linear;transition:background-color .2s linear}.ps-container.ie6 .ps-scrollbar-y{font-size:0}.ps-container .ps-scrollbar-y-rail:hover .ps-scrollbar-y,.ps-container .ps-scrollbar-y-rail.hover .ps-scrollbar-y{background-color:#999}.ps-container.ie .ps-scrollbar-x,.ps-container.ie .ps-scrollbar-y{visibility:hidden}.ps-container.ie:hover .ps-scrollbar-x,.ps-container.ie:hover .ps-scrollbar-y,.ps-container.ie.hover .ps-scrollbar-x,.ps-container.ie.hover .ps-scrollbar-y{visibility:visible} \ No newline at end of file diff --git a/min/perfect-scrollbar.min.js b/min/perfect-scrollbar.min.js index 23e71a4..1a2cff8 100644 --- a/min/perfect-scrollbar.min.js +++ b/min/perfect-scrollbar.min.js @@ -1,4 +1,4 @@ /*! perfect-scrollbar - v0.5.1 * http://noraesae.github.com/perfect-scrollbar/ -* Copyright (c) 2014 Hyeonje Alex Jun; Licensed MIT */ +* Copyright (c) 2014 Hyunje Alex Jun; Licensed MIT */ (function(e){"use strict";"function"==typeof define&&define.amd?define(["jquery"],e):"object"==typeof exports?e(require("jquery")):e(jQuery)})(function(e){"use strict";var t={wheelSpeed:1,wheelPropagation:!1,minScrollbarLength:null,maxScrollbarLength:null,useBothWheelAxes:!1,useKeyboard:!0,suppressScrollX:!1,suppressScrollY:!1,scrollXMarginOffset:0,scrollYMarginOffset:0,includePadding:!1},n=function(){var e=0;return function(){var t=e;return e+=1,".perfect-scrollbar-"+t}}();e.fn.perfectScrollbar=function(o,r){return this.each(function(){var l=e.extend(!0,{},t),a=e(this);if("object"==typeof o?e.extend(!0,l,o):r=o,"update"===r)return a.data("perfect-scrollbar-update")&&a.data("perfect-scrollbar-update")(),a;if("destroy"===r)return a.data("perfect-scrollbar-destroy")&&a.data("perfect-scrollbar-destroy")(),a;if(a.data("perfect-scrollbar"))return a.data("perfect-scrollbar");a.addClass("ps-container");var s,i,c,d,u,p,f,v,h,b,g=e("
").appendTo(a),m=e("
").appendTo(a),w=e("
").appendTo(g),T=e("
").appendTo(m),L=parseInt(g.css("bottom"),10),y=L===L,I=y?null:parseInt(g.css("top"),10),C=parseInt(m.css("right"),10),S=C===C,x=S?null:parseInt(m.css("left"),10),D="rtl"===a.css("direction"),P=n(),X=parseInt(g.css("borderLeftWidth"),10)+parseInt(g.css("borderRightWidth"),10),Y=parseInt(g.css("borderTopWidth"),10)+parseInt(g.css("borderBottomWidth"),10),k=function(e,t){var n=e+t,o=d-h;b=0>n?0:n>o?o:n;var r=parseInt(b*(p-d)/(d-h),10);a.scrollTop(r)},E=function(e,t){var n=e+t,o=c-f;v=0>n?0:n>o?o:n;var r=parseInt(v*(u-c)/(c-f),10);a.scrollLeft(r)},M=function(e){return l.minScrollbarLength&&(e=Math.max(e,l.minScrollbarLength)),l.maxScrollbarLength&&(e=Math.min(e,l.maxScrollbarLength)),e},W=function(){var e={width:c,display:s?"inherit":"none"};e.left=D?a.scrollLeft()+c-u:a.scrollLeft(),y?e.bottom=L-a.scrollTop():e.top=I+a.scrollTop(),g.css(e);var t={top:a.scrollTop(),height:d,display:i?"inherit":"none"};S?t.right=D?u-a.scrollLeft()-C-T.outerWidth():C-a.scrollLeft():t.left=D?a.scrollLeft()+2*c-u-x-T.outerWidth():x+a.scrollLeft(),m.css(t),w.css({left:v,width:f-X}),T.css({top:b,height:h-Y}),s?a.addClass("ps-active-x"):a.removeClass("ps-active-x"),i?a.addClass("ps-active-y"):a.removeClass("ps-active-y")},j=function(){g.hide(),m.hide(),c=l.includePadding?a.innerWidth():a.width(),d=l.includePadding?a.innerHeight():a.height(),u=a.prop("scrollWidth"),p=a.prop("scrollHeight"),!l.suppressScrollX&&u>c+l.scrollXMarginOffset?(s=!0,f=M(parseInt(c*c/u,10)),v=parseInt(a.scrollLeft()*(c-f)/(u-c),10)):(s=!1,f=0,v=0,a.scrollLeft(0)),!l.suppressScrollY&&p>d+l.scrollYMarginOffset?(i=!0,h=M(parseInt(d*d/p,10)),b=parseInt(a.scrollTop()*(d-h)/(p-d),10)):(i=!1,h=0,b=0,a.scrollTop(0)),b>=d-h&&(b=d-h),v>=c-f&&(v=c-f),W(),g.show(),m.show()},O=function(){var t,n;w.bind("mousedown"+P,function(e){n=e.pageX,t=w.position().left,g.addClass("in-scrolling"),e.stopPropagation(),e.preventDefault()}),e(document).bind("mousemove"+P,function(e){g.hasClass("in-scrolling")&&(E(t,e.pageX-n),j(),e.stopPropagation(),e.preventDefault())}),e(document).bind("mouseup"+P,function(){g.hasClass("in-scrolling")&&g.removeClass("in-scrolling")}),t=n=null},q=function(){var t,n;T.bind("mousedown"+P,function(e){n=e.pageY,t=T.position().top,m.addClass("in-scrolling"),e.stopPropagation(),e.preventDefault()}),e(document).bind("mousemove"+P,function(e){m.hasClass("in-scrolling")&&(k(t,e.pageY-n),j(),e.stopPropagation(),e.preventDefault())}),e(document).bind("mouseup"+P,function(){m.hasClass("in-scrolling")&&m.removeClass("in-scrolling")}),t=n=null},A=function(e,t){var n=a.scrollTop();if(0===e){if(!i)return!1;if(0===n&&t>0||n>=p-d&&0>t)return!l.wheelPropagation}var o=a.scrollLeft();if(0===t){if(!s)return!1;if(0===o&&0>e||o>=u-c&&e>0)return!l.wheelPropagation}return!0},B=function(){var e=!1,t=function(e){var t=e.originalEvent.deltaX,n=-1*e.originalEvent.deltaY;return(t===void 0||n===void 0)&&(t=-1*e.originalEvent.wheelDeltaX/6,n=e.originalEvent.wheelDeltaY/6),e.originalEvent.deltaMode&&1===e.originalEvent.deltaMode&&(t*=10,n*=10),t!==t&&n!==n&&(t=0,n=e.originalEvent.wheelDelta),[t,n]},n=function(n){var o=t(n),r=o[0],c=o[1];e=!1,l.useBothWheelAxes?i&&!s?(c?a.scrollTop(a.scrollTop()-c*l.wheelSpeed):a.scrollTop(a.scrollTop()+r*l.wheelSpeed),e=!0):s&&!i&&(r?a.scrollLeft(a.scrollLeft()+r*l.wheelSpeed):a.scrollLeft(a.scrollLeft()-c*l.wheelSpeed),e=!0):(a.scrollTop(a.scrollTop()-c*l.wheelSpeed),a.scrollLeft(a.scrollLeft()+r*l.wheelSpeed)),j(),e=e||A(r,c),e&&(n.stopPropagation(),n.preventDefault())};window.onwheel!==void 0?a.bind("wheel"+P,n):window.onmousewheel!==void 0&&a.bind("mousewheel"+P,n)},H=function(){var t=!1;a.bind("mouseenter"+P,function(){t=!0}),a.bind("mouseleave"+P,function(){t=!1});var n=!1;e(document).bind("keydown"+P,function(o){if(!(o.isDefaultPrevented&&o.isDefaultPrevented()||!t||e(document.activeElement).is(":input,[contenteditable]"))){var r=0,l=0;switch(o.which){case 37:r=-30;break;case 38:l=30;break;case 39:r=30;break;case 40:l=-30;break;case 33:l=90;break;case 32:case 34:l=-90;break;case 35:l=-d;break;case 36:l=d;break;default:return}a.scrollTop(a.scrollTop()-l),a.scrollLeft(a.scrollLeft()+r),n=A(r,l),n&&o.preventDefault()}})},K=function(){var e=function(e){e.stopPropagation()};T.bind("click"+P,e),m.bind("click"+P,function(e){var t=parseInt(h/2,10),n=e.pageY-m.offset().top-t,o=d-h,r=n/o;0>r?r=0:r>1&&(r=1),a.scrollTop((p-d)*r)}),w.bind("click"+P,e),g.bind("click"+P,function(e){var t=parseInt(f/2,10),n=e.pageX-g.offset().left-t,o=c-f,r=n/o;0>r?r=0:r>1&&(r=1),a.scrollLeft((u-c)*r)})},Q=function(){var t=function(e,t){a.scrollTop(a.scrollTop()-t),a.scrollLeft(a.scrollLeft()-e),j()},n={},o=0,r={},l=null,s=!1;e(window).bind("touchstart"+P,function(){s=!0}),e(window).bind("touchend"+P,function(){s=!1}),a.bind("touchstart"+P,function(e){var t=e.originalEvent.targetTouches[0];n.pageX=t.pageX,n.pageY=t.pageY,o=(new Date).getTime(),null!==l&&clearInterval(l),e.stopPropagation()}),a.bind("touchmove"+P,function(e){if(!s&&1===e.originalEvent.targetTouches.length){var l=e.originalEvent.targetTouches[0],a={};a.pageX=l.pageX,a.pageY=l.pageY;var i=a.pageX-n.pageX,c=a.pageY-n.pageY;t(i,c),n=a;var d=(new Date).getTime(),u=d-o;u>0&&(r.x=i/u,r.y=c/u,o=d),e.preventDefault()}}),a.bind("touchend"+P,function(){clearInterval(l),l=setInterval(function(){return.01>Math.abs(r.x)&&.01>Math.abs(r.y)?(clearInterval(l),void 0):(t(30*r.x,30*r.y),r.x*=.8,r.y*=.8,void 0)},10)})},R=function(){a.bind("scroll"+P,function(){j()})},z=function(){a.unbind(P),e(window).unbind(P),e(document).unbind(P),a.data("perfect-scrollbar",null),a.data("perfect-scrollbar-update",null),a.data("perfect-scrollbar-destroy",null),w.remove(),T.remove(),g.remove(),m.remove(),g=m=w=T=s=i=c=d=u=p=f=v=L=y=I=h=b=C=S=x=D=P=null},F=function(t){a.addClass("ie").addClass("ie"+t);var n=function(){var t=function(){e(this).addClass("hover")},n=function(){e(this).removeClass("hover")};a.bind("mouseenter"+P,t).bind("mouseleave"+P,n),g.bind("mouseenter"+P,t).bind("mouseleave"+P,n),m.bind("mouseenter"+P,t).bind("mouseleave"+P,n),w.bind("mouseenter"+P,t).bind("mouseleave"+P,n),T.bind("mouseenter"+P,t).bind("mouseleave"+P,n)},o=function(){W=function(){var e={left:v+a.scrollLeft(),width:f};y?e.bottom=L:e.top=I,w.css(e);var t={top:b+a.scrollTop(),height:h};S?t.right=C:t.left=x,T.css(t),w.hide().show(),T.hide().show()}};6===t&&(n(),o())},G="ontouchstart"in window||window.DocumentTouch&&document instanceof window.DocumentTouch,J=function(){var e=navigator.userAgent.toLowerCase().match(/(msie) ([\w.]+)/);e&&"msie"===e[1]&&F(parseInt(e[2],10)),j(),R(),O(),q(),K(),B(),G&&Q(),l.useKeyboard&&H(),a.data("perfect-scrollbar",a),a.data("perfect-scrollbar-update",j),a.data("perfect-scrollbar-destroy",z)};return J(),a})}}); \ No newline at end of file diff --git a/perfect-scrollbar.jquery.json b/perfect-scrollbar.jquery.json index adde037..a04787a 100644 --- a/perfect-scrollbar.jquery.json +++ b/perfect-scrollbar.jquery.json @@ -4,7 +4,7 @@ "description": "Tiny but perfect jquery scrollbar plugin.", "version": "0.5.1", "author": { - "name": "Hyeonje Alex Jun", + "name": "Hyunje Alex Jun", "email": "me@noraesae.net", "url": "https://github.com/noraesae/" }, @@ -29,7 +29,7 @@ "bugs": "https://github.com/noraesae/perfect-scrollbar/issues/", "maintainers": [ { - "name": "Hyeonje Alex Jun", + "name": "Hyunje Alex Jun", "email": "me@noraesae.net", "url": "https://github.com/noraesae/" } diff --git a/src/perfect-scrollbar.js b/src/perfect-scrollbar.js index 1241f3e..f95813d 100644 --- a/src/perfect-scrollbar.js +++ b/src/perfect-scrollbar.js @@ -1,4 +1,4 @@ -/* Copyright (c) 2012, 2014 Hyeonje Alex Jun and other contributors +/* Copyright (c) 2012, 2014 Hyunje Alex Jun and other contributors * Licensed under the MIT License */ (function (factory) {