Skip to content
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

Merge from qpitlove/angular-nanoscroller #11

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Merge from qpitlove/angular-nanoscroller #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a7d97ab
replace from $scope.evalAsync to $timeout with option for only NanoSc…
qpitlove Apr 9, 2015
77be3b9
replace from $scope.evalAsync to $timeout with option for only NanoSc…
qpitlove Apr 9, 2015
648cd42
version up nano scroller, angular
qpitlove Apr 9, 2015
75f883e
nano-content element 존재할 경우에만 listener 처리
qpitlove Apr 20, 2015
35977d8
$timeout timing에 따라 listener 실행시점이 아닌 실제 코드 동작 시점에 element 체크한
qpitlove Apr 20, 2015
6cb3cca
FF에서 watch값이 설정되지 않은 경우 익명 function이 리턴 되며 exception이 발생되어 type strin…
qpitlove Apr 22, 2015
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
4 changes: 2 additions & 2 deletions bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"tests"
],
"dependencies": {
"nanoscroller": "~0.8.0",
"angular": "~1.2"
"nanoscroller": "~0.8.5",
"angular": "~1.3"
}
}
40 changes: 24 additions & 16 deletions scrollable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,21 +65,25 @@
function listener(newHeight, oldHeight) {
// If this is first run, create nanoScroller
if (newHeight === oldHeight) {
// First run must be async
scope.$evalAsync(function () {
$nanoElement.nanoScroller(options);
$nanoElement.nanoScroller();
});
// First run must be async by using $timeout instead of $scope.evalAsync for prevent executing $digest twice
$timeout(function () {
if ($nanoElement) {
$nanoElement.nanoScroller(options);
$nanoElement.nanoScroller();
}
}, 0, false);
}
//If scroller was on the bottom, scroll to bottom
else if (newHeight !== oldHeight && contentElement.scrollTop &&
(oldHeight - contentElement.scrollTop - parentElement.clientHeight) < scrollableConfig.bottomMargin) {
scope.$evalAsync(function () {
$timeout(function () {
// To make right calculation scroller must be reseted
// See https://github.com/maxaon/angular-nanoscroller/issues/4
$nanoElement.nanoScroller();
$nanoElement.nanoScroller({scroll: 'bottom'});
});
if ($nanoElement) {
$nanoElement.nanoScroller();
$nanoElement.nanoScroller({scroll: 'bottom'});
}
}, 0, false);

}
// Otherwise just update the pane
Expand All @@ -100,13 +104,17 @@
// Call scroller after transclusion
listener();
}
else if (typeof attr['watch'] === 'string' || attr['watchCollection']) {
angular.forEach(splitter(attr['watch']), function (name) {
scope.$watch(name, collectionListener);
});
angular.forEach(splitter(attr['watchCollection']), function (name) {
scope.$watchCollection(name, collectionListener);
});
else if (attr['watch'] || attr['watchCollection']) {
if (typeof attr['watch'] === 'string' ){
angular.forEach(splitter(attr['watch']), function (name) {
scope.$watch(name, collectionListener);
});
}
if (typeof attr['watchCollection'] === 'string' ) {
angular.forEach(splitter(attr['watchCollection']), function (name) {
scope.$watchCollection(name, collectionListener);
});
}
}
// If no watchers are supplied fall back to content element height check
else {
Expand Down