Skip to content

Commit a377c8d

Browse files
committed
more cleanup
1 parent 646a78a commit a377c8d

File tree

1 file changed

+12
-17
lines changed

1 file changed

+12
-17
lines changed

src/ui-scroll.js

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,7 @@ angular.module('ui.scroll', [])
571571
let viewport = new Viewport(buffer, element, controllers, $attr);
572572
let adapter = new Adapter($attr, viewport, buffer, () => {
573573
dismissPendingRequests();
574-
return adjustBuffer(ridActual);
574+
adjustBuffer(ridActual);
575575
});
576576

577577
var onDatasourceMinIndexChanged = function(value) {
@@ -597,7 +597,7 @@ angular.module('ui.scroll', [])
597597
}
598598

599599
return (success) => {
600-
return datasource.get({
600+
datasource.get({
601601
index: buffer.next,
602602
append: buffer.length ? buffer[buffer.length - 1].item : void 0,
603603
count: bufferSize
@@ -611,7 +611,7 @@ angular.module('ui.scroll', [])
611611
}
612612

613613
return (success) => {
614-
return datasource.get({
614+
datasource.get({
615615
index: buffer.first - bufferSize,
616616
prepend: buffer.length ? buffer[0].item : void 0,
617617
count: bufferSize
@@ -678,35 +678,30 @@ angular.module('ui.scroll', [])
678678

679679
function reload() {
680680
dismissPendingRequests();
681-
682681
viewport.resetTopPadding();
683682
viewport.resetBottomPadding();
684683

685684
if (arguments.length)
686685
startIndex = arguments[0];
687686

688687
buffer.reset(startIndex);
689-
690-
return adjustBuffer(ridActual);
688+
adjustBuffer(ridActual);
691689
}
692690

693691
function isElementVisible(wrapper) {
694692
return wrapper.element.height() && wrapper.element[0].offsetParent;
695693
}
696694

697695
function visibilityWatcher(wrapper) {
698-
if (!isElementVisible(wrapper)) {
699-
return;
696+
if (isElementVisible(wrapper)) {
697+
buffer.forEach((item) => {
698+
if (angular.isFunction(item.unregisterVisibilityWatcher)) {
699+
item.unregisterVisibilityWatcher();
700+
delete item.unregisterVisibilityWatcher;
701+
}
702+
});
703+
adjustBuffer();
700704
}
701-
702-
buffer.forEach((item) => {
703-
if (angular.isFunction(item.unregisterVisibilityWatcher)) {
704-
item.unregisterVisibilityWatcher();
705-
delete item.unregisterVisibilityWatcher;
706-
}
707-
});
708-
709-
return adjustBuffer();
710705
}
711706

712707
function insertWrapperContent(wrapper, sibling) {

0 commit comments

Comments
 (0)