milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update shared components

Browse source
This commit is contained in:
Luke Pulverenti 2016-08-06 22:11:39 -04:00
parent da25a9cc2a
commit 866ecf78b4
16 changed files with 65 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

24
dashboard-ui/bower_components/emby-webcomponents/scroller/smoothscroller.js vendored
View file

@ -170,12 +170,7 @@ define(['browser', 'layoutManager', 'scrollStyles'], function (browser, layoutMa
// transform is the only way to guarantee animation
options.enableNativeScroll = false;
}
else if (browser.edge && (!browser.xboxOne && !browser.touch)) {
// no scrolling supported
options.enableNativeScroll = false;
}
else if (layoutManager.desktop ||
!browser.animate) {
else if (layoutManager.desktop || !browser.animate) {
options.enableNativeScroll = true;
}
@ -899,19 +894,24 @@ define(['browser', 'layoutManager', 'scrollStyles'], function (browser, layoutMa
return;
}
var delta = normalizeWheelDelta(event);
// Trap scrolling only when necessary and/or requested
if (delta > 0 && pos.dest < pos.end || delta < 0 && pos.dest > pos.start) {
//stopDefault(event, 1);
}
if (transform) {
// Trap scrolling only when necessary and/or requested
if (delta > 0 && pos.dest < pos.end || delta < 0 && pos.dest > pos.start) {
//stopDefault(event, 1);
}
self.slideBy(o.scrollBy * delta);
} else {
if (isSmoothScrollSupported) {
delta *= 12;
}
if (o.horizontal) {
slideeElement.scrollLeft += 12 * delta;
slideeElement.scrollLeft += delta;
} else {
slideeElement.scrollTop += 12 * delta;
slideeElement.scrollTop += delta;
}
}
}