Compare commits

...

2 Commits
0.3.2 ... 0.3.3

Author SHA1 Message Date
Hyunje Alex Jun
9d6728e3ff Release 0.3.3.
Patch notes
1. Apply jshint.
2. Fix jQuery plugin site version problem.
2013-03-14 15:47:20 +09:00
Hyunje Alex Jun
69c37268a1 Apply jshint. 2013-03-14 15:46:12 +09:00
4 changed files with 21 additions and 21 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -2,7 +2,7 @@
"name": "perfect-scrollbar",
"title": "perfect-scrollbar",
"description": "Tiny but perfect jquery scrollbar plugin.",
"version": "0.3.2",
"version": "0.3.3",
"author": {
"name": "HyeonJe Jun",
"email": "noraesae@yuiazu.net",

View File

@@ -49,19 +49,19 @@
content_height,
scrollbar_x_width,
scrollbar_x_left,
scrollbar_x_bottom = parseInt($scrollbar_x.css('bottom')),
scrollbar_x_bottom = parseInt($scrollbar_x.css('bottom'), 10),
scrollbar_y_height,
scrollbar_y_top,
scrollbar_y_right = parseInt($scrollbar_y.css('right'));
scrollbar_y_right = parseInt($scrollbar_y.css('right'), 10);
var updateContentScrollTop = function() {
var scroll_top = parseInt(scrollbar_y_top * content_height / container_height);
var scroll_top = parseInt(scrollbar_y_top * content_height / container_height, 10);
$this.scrollTop(scroll_top);
$scrollbar_x.css({bottom: scrollbar_x_bottom - scroll_top});
};
var updateContentScrollLeft = function() {
var scroll_left = parseInt(scrollbar_x_left * content_width / container_width);
var scroll_left = parseInt(scrollbar_x_left * content_width / container_width, 10);
$this.scrollLeft(scroll_left);
$scrollbar_y.css({right: scrollbar_y_right - scroll_left});
};
@@ -72,8 +72,8 @@
content_width = $content.outerWidth(false);
content_height = $content.outerHeight(false);
if(container_width < content_width) {
scrollbar_x_width = parseInt(container_width * container_width / content_width);
scrollbar_x_left = parseInt($this.scrollLeft() * container_width / content_width);
scrollbar_x_width = parseInt(container_width * container_width / content_width, 10);
scrollbar_x_left = parseInt($this.scrollLeft() * container_width / content_width, 10);
}
else {
scrollbar_x_width = 0;
@@ -81,8 +81,8 @@
$this.scrollLeft(0);
}
if(container_height < content_height) {
scrollbar_y_height = parseInt(container_height * container_height / content_height);
scrollbar_y_top = parseInt($this.scrollTop() * container_height / content_height);
scrollbar_y_height = parseInt(container_height * container_height / content_height, 10);
scrollbar_y_top = parseInt($this.scrollTop() * container_height / content_height, 10);
}
else {
scrollbar_y_height = 0;
@@ -186,26 +186,26 @@
var bindMouseWheelHandler = function() {
var shouldPreventDefault = function(deltaX, deltaY) {
var scrollTop = $this.scrollTop();
if(scrollTop == 0 && deltaY > 0 && deltaX == 0) {
return !settings["wheelPropagation"];
if(scrollTop === 0 && deltaY > 0 && deltaX === 0) {
return !settings.wheelPropagation;
}
else if(scrollTop >= content_height - container_height && deltaY < 0 && deltaX == 0) {
return !settings["wheelPropagation"];
else if(scrollTop >= content_height - container_height && deltaY < 0 && deltaX === 0) {
return !settings.wheelPropagation;
}
var scrollLeft = $this.scrollLeft();
if(scrollLeft == 0 && deltaX < 0 && deltaY == 0) {
return !settings["wheelPropagation"];
if(scrollLeft === 0 && deltaX < 0 && deltaY === 0) {
return !settings.wheelPropagation;
}
else if(scrollLeft >= content_width - container_width && deltaX > 0 && deltaY == 0) {
return !settings["wheelPropagation"];
else if(scrollLeft >= content_width - container_width && deltaX > 0 && deltaY === 0) {
return !settings.wheelPropagation;
}
return true;
};
$this.mousewheel(function(e, delta, deltaX, deltaY) {
$this.scrollTop($this.scrollTop() - (deltaY * settings["wheelSpeed"]));
$this.scrollLeft($this.scrollLeft() + (deltaX * settings["wheelSpeed"]));
$this.scrollTop($this.scrollTop() - (deltaY * settings.wheelSpeed));
$this.scrollLeft($this.scrollLeft() + (deltaX * settings.wheelSpeed));
// update bar position
updateBarSizeAndPosition();