Skip to content

Commit b4632b8

Browse files
committed
Merge commit '6df8a3dfa9a64f923a94b3b4a774127c28c63b29' into scrollingOptimization
2 parents 3ff93b1 + 6df8a3d commit b4632b8

File tree

5 files changed

+24
-25
lines changed

5 files changed

+24
-25
lines changed

dist/ui-scroll-jqlite.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
/*!
2-
* angular-ui-scroll
3-
* https://github.com/angular-ui/ui-scroll.git
4-
* Version: 1.3.3 -- 2016-03-11T21:07:06.923Z
5-
* License: MIT
6-
*/
7-
8-
9-
(function () {
1+
/*!
2+
* angular-ui-scroll
3+
* https://github.com/angular-ui/ui-scroll.git
4+
* Version: 1.3.3 -- 2016-03-16T09:12:39.242Z
5+
* License: MIT
6+
*/
7+
8+
9+
(function () {
1010
'use strict';
1111

1212
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'); } }; }();

dist/ui-scroll-jqlite.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/ui-scroll.js

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
/*!
2-
* angular-ui-scroll
3-
* https://github.com/angular-ui/ui-scroll.git
4-
* Version: 1.3.3 -- 2016-03-11T21:07:06.923Z
5-
* License: MIT
6-
*/
7-
8-
9-
(function () {
1+
/*!
2+
* angular-ui-scroll
3+
* https://github.com/angular-ui/ui-scroll.git
4+
* Version: 1.3.3 -- 2016-03-16T09:12:39.242Z
5+
* License: MIT
6+
*/
7+
8+
9+
(function () {
1010
'use strict';
1111

1212
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; };
@@ -268,8 +268,7 @@ angular.module('ui.scroll', []).directive('uiScrollViewport', function () {
268268
},
269269
bottomDataPos: function bottomDataPos() {
270270
var scrollHeight = viewport[0].scrollHeight;
271-
scrollHeight = scrollHeight !== null ? scrollHeight : viewport[0].document.documentElement.scrollHeight;
272-
271+
scrollHeight = scrollHeight != null ? scrollHeight : viewport[0].document.documentElement.scrollHeight;
273272
return scrollHeight - bottomPadding.height();
274273
},
275274
topDataPos: function topDataPos() {

0 commit comments

Comments
 (0)