cartodb/perfect-scrollbar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix typos.

Browse Source
This commit is contained in:
Hyunje Alex Jun 2015-01-26 16:09:55 +00:00
parent ee455fafa5
commit 89c3bdb1cf
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/lib/helper.js
View File

@ -31,7 +31,7 @@ exports.clone = function (obj) {
exports.extend = function (original, source) { exports.extend = function (original, source) {
var result = this.clone(original); var result = this.clone(original);
for (var key in source) { for (var key in source) {
result = this.clone(source[key]); result[key] = this.clone(source[key]);
} }
return result; return result;
}; };

8
src/js/plugin/initialize.js
View File

@ -218,18 +218,18 @@ module.exports = function (element, userSettings) {
// only vertical scrollbar is active and useBothWheelAxes option is // only vertical scrollbar is active and useBothWheelAxes option is
// active, so let's scroll vertical bar using both mouse wheel axes // active, so let's scroll vertical bar using both mouse wheel axes
if (deltaY) { if (deltaY) {
element.scrollTop = element.scrollTop() - (deltaY * i.settings.wheelSpeed); element.scrollTop = element.scrollTop - (deltaY * i.settings.wheelSpeed);
} else { } else {
element.scrollTop = element.scrollTop() + (deltaX * i.settings.wheelSpeed); element.scrollTop = element.scrollTop + (deltaX * i.settings.wheelSpeed);
} }
shouldPrevent = true; shouldPrevent = true;
} else if (i.scrollbarXActive && !i.scrollbarYActive) { } else if (i.scrollbarXActive && !i.scrollbarYActive) {
// useBothWheelAxes and only horizontal bar is active, so use both // useBothWheelAxes and only horizontal bar is active, so use both
// wheel axes for horizontal bar // wheel axes for horizontal bar
if (deltaX) { if (deltaX) {
element.scrollLeft = element.scrollLeft() + (deltaX * i.settings.wheelSpeed); element.scrollLeft = element.scrollLeft + (deltaX * i.settings.wheelSpeed);
} else { } else {
element.scrollLeft = element.scrollLeft() - (deltaY * i.settings.wheelSpeed); element.scrollLeft = element.scrollLeft - (deltaY * i.settings.wheelSpeed);
} }
shouldPrevent = true; shouldPrevent = true;
} }