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

given the ability to select the viewport container id, not just the body #23

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

given the ability to select the viewport container id, not just the body #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af8bd90
given the ability to select the viewport container id, not just the body
May 28, 2018
c3e92b5
Merge pull request #1 from bohrlot/master
Bohrlotto May 28, 2018
9144aab
fix deps
May 28, 2018
a5fb7fc
Merge branch 'master' of https://github.com/bohrlot/angular-viewport-…
May 28, 2018
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
8 changes: 7 additions & 1 deletion angular-viewport-watch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,13 @@
return {
restrict: "AE",
link: function(scope, element, attr) {
var elementWatcher = scrollMonitor.create(element, scope.$eval(attr.viewportWatch || "0"));
var elementWatcher;
if (attr.containerId){
var containerMonitor = scrollMonitor.createContainer(document.getElementById(attr.containerId));
elementWatcher = containerMonitor.create(element, scope.$eval(attr.viewportWatch || '0'));
} else {
elementWatcher = scrollMonitor.create(element, scope.$eval(attr.viewportWatch || "0"));
}
function watchDuringDisable() {
this.$$watchersBackup = this.$$watchersBackup || [];
this.$$watchers = this.$$watchersBackup;
Expand Down
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
],
"dependencies": {
"angular": "^1.2.0",
"scrollMonitor": "git@github.com:stutrek/scrollMonitor.git#~1.0.12"
"scrollMonitor": "https://github.com/stutrek/scrollMonitor.git#1.2.4"
},
"devDependencies": {
"angular-mocks": "^1.2.0",
Expand Down