Skip to content

Refactor the scroll to use an interval instead of firing every digest #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Refactor the scroll to use an interval instead of firing every digest #56

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5cfa224
Refactor the scroll to use an interval instead of firing every digest…
Mar 4, 2016
3439285
Updated the remove $timeout to remove $digest from the scroll and res…
Mar 8, 2016
ab2e764
Merge upstream master into master
Mar 8, 2016
1100a54
Update the dist folder
Mar 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion demo/examples/applyUpdate.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>Scroller Demo (multiple lists) </title>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.0.5/angular.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>
<script src="applyUpdate.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion demo/examples/bootstrapWellClass.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>Scroller Demo (bootstrap's well css class) </title>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.0.6/angular.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>
<script src="customviewport.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion demo/examples/customviewport.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>Scroller Demo (multiple lists) </title>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.0.5/angular.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>
<script src="customviewport.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion demo/examples/listScroller.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>Scroller Demo (list based)</title>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.0.5/angular.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>
<script src="listScroller.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion demo/examples/persistentScroll.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>Scroller Demo (list based)</title>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.0.5/angular.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>
<script src="persistentScroll.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion demo/examples/positionedList.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>Scroller Demo (list based)</title>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.0.5/angular.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>
<script src="positionedList.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion demo/examples/repro.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>Scroller Demo (multiple lists) </title>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.0.5/angular.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>
<script src="repro.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion demo/examples/scopeDatasource.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>Scroller Demo (datasource within scope)</title>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.0.5/angular.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>
<script src="scopeDatasource.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion demo/examples/scrollBubblingPrevent.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8">
<meta http-equiv="cache-control" content="no-cache" />
<title>Scroller Demo (scroll bubbles up only on eof/bof) </title>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.0.5/angular.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>
<script src="scrollBubblingPrevent.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion demo/examples/tableScroller.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>Scroller Demo (table based)</title>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.0.5/angular.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>
<script src="tableScroller.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion demo/examples/windowviewport.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>Scroller Demo (entire window)</title>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.0.5/angular.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>
<script src="windowviewport.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion demo/examples/windowviewportInline.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<title>Scroller Demo (entire window)</title>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.0.5/angular.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.16/angular.js"></script>
<script src="../../dist/ui-scroll.js"></script>
<script src="../../dist/ui-scroll-jqlite.js"></script>
<script src="windowviewportInline.js"></script>
Expand Down
18 changes: 9 additions & 9 deletions dist/ui-scroll-jqlite.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*!
* angular-ui-scroll
* https://github.com/angular-ui/ui-scroll.git
* Version: 1.3.3 -- 2016-03-04T12:15:03.597Z
* License: MIT
*/
(function () {
/*!
* angular-ui-scroll
* https://github.com/angular-ui/ui-scroll.git
* Version: 1.3.3 -- 2016-03-04T20:33:48.293Z
* License: MIT
*/


(function () {
'use strict';

var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i['return']) _i['return'](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError('Invalid attempt to destructure non-iterable instance'); } }; }();
Expand Down
2 changes: 1 addition & 1 deletion dist/ui-scroll-jqlite.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

68 changes: 45 additions & 23 deletions dist/ui-scroll.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*!
* angular-ui-scroll
* https://github.com/angular-ui/ui-scroll.git
* Version: 1.3.3 -- 2016-03-04T12:15:03.597Z
* License: MIT
*/
(function () {
/*!
* angular-ui-scroll
* https://github.com/angular-ui/ui-scroll.git
* Version: 1.3.3 -- 2016-03-04T20:33:48.293Z
* License: MIT
*/


(function () {
'use strict';

var _typeof = typeof Symbol === 'function' && typeof Symbol.iterator === 'symbol' ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === 'function' && obj.constructor === Symbol ? 'symbol' : typeof obj; };
Expand All @@ -30,7 +30,7 @@ angular.module('ui.scroll', []).directive('uiScrollViewport', function () {
return this;
}]
};
}).directive('uiScroll', ['$log', '$injector', '$rootScope', '$timeout', '$q', '$parse', function (console, $injector, $rootScope, $timeout, $q, $parse) {
}).directive('uiScroll', ['$log', '$injector', '$rootScope', '$timeout', '$q', '$parse', '$interval', function (console, $injector, $rootScope, $timeout, $q, $parse, $interval) {
var $animate = $injector.has && $injector.has('$animate') ? $injector.get('$animate') : null;
var isAngularVersionLessThen1_3 = angular.version.major === 1 && angular.version.minor < 3;
//const log = console.debug || console.log;
Expand Down Expand Up @@ -580,11 +580,28 @@ angular.module('ui.scroll', []).directive('uiScrollViewport', function () {

adapter.reload = reload;

var scrolling = false;

// events and bindings
viewport.bind('resize', resizeAndScrollHandler);
viewport.bind('scroll', resizeAndScrollHandler);
viewport.bind('scroll', resizeHandler);
viewport.bind('mousewheel', wheelHandler);

function resizeHandler() {
scrolling = true;
}

//function stopScrollingHandler() {
// scrolling = false;
//}

$interval(function () {
if (scrolling && !adapter.isLoading) {
scrolling = false;
adjustBufferWithoutTimeout();
}
}, 100);

$scope.$watch(datasource.revision, function () {
return reload();
});
Expand All @@ -593,7 +610,7 @@ angular.module('ui.scroll', []).directive('uiScrollViewport', function () {
// clear the buffer. It is necessary to remove the elements and $destroy the scopes
buffer.clear();
viewport.unbind('resize', resizeAndScrollHandler);
viewport.unbind('scroll', resizeAndScrollHandler);
viewport.unbind('scroll', resizeHandler);
viewport.unbind('mousewheel', wheelHandler);
});

Expand Down Expand Up @@ -726,18 +743,21 @@ angular.module('ui.scroll', []).directive('uiScrollViewport', function () {
function adjustBuffer(rid) {
// We need the item bindings to be processed before we can do adjustment
return $timeout(function () {
processBufferedItems(rid);
return adjustBufferWithoutTimeout(rid);
});
}

if (viewport.shouldLoadBottom()) {
enqueueFetch(rid, true);
} else if (viewport.shouldLoadTop()) {
enqueueFetch(rid, false);
}
function adjustBufferWithoutTimeout(rid) {
processBufferedItems(rid);
if (viewport.shouldLoadBottom()) {
enqueueFetch(rid, true);
} else if (viewport.shouldLoadTop()) {
enqueueFetch(rid, false);
}

if (!pending.length) {
return adapter.calculateProperties();
}
});
if (!pending.length) {
return adapter.calculateProperties();
}
}

function adjustBufferAfterFetch(rid) {
Expand Down Expand Up @@ -823,7 +843,9 @@ angular.module('ui.scroll', []).directive('uiScrollViewport', function () {

function resizeAndScrollHandler() {
if (!$rootScope.$$phase && !adapter.isLoading) {
adjustBuffer();
$timeout(function () {
adjustBuffer();
});
}
}

Expand Down
Loading