kylefang/angular.js
1
0
Fork 0
mirror of https://github.com/zhigang1992/angular.js.git synced 2026-05-12 19:29:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor($autoScroll): rename to $anchorScroll and allow disabling auto scrolling (links)

Browse Source 
Now, that we have autoscroll attribute on ng:include, there is no reason to disable the service completely, so $anchorScrollProvider.disableAutoScrolling() means it won't be scrolling when $location.hash() changes.

And then, it's not $autoScroll at all, it actually scrolls to anchor when it's called, so I renamed
it to $anchorScroll.
This commit is contained in:
Vojta Jina
2012-01-12 03:00:34 -08:00
parent 985d3d7558
commit 15fd735793
6 changed files with 41 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/widgetsSpec.js
View File

@@ -225,10 +225,10 @@ describe('widget', function() {
describe('autoscoll', function() {
var autoScrollSpy;
function spyOnAutoScroll() {
function spyOnAnchorScroll() {
return function($provide) {
autoScrollSpy = jasmine.createSpy('$autoScroll');
$provide.value('$autoScroll', autoScrollSpy);
autoScrollSpy = jasmine.createSpy('$anchorScroll');
$provide.value('$anchorScroll', autoScrollSpy);
};
}
@@ -247,20 +247,20 @@ describe('widget', function() {
};
}
beforeEach(module(spyOnAutoScroll()));
beforeEach(module(spyOnAnchorScroll()));
beforeEach(inject(
putIntoCache('template.html', 'CONTENT'),
putIntoCache('another.html', 'CONTENT')));
it('should call $autoScroll if autoscroll attribute is present', inject(
it('should call $anchorScroll if autoscroll attribute is present', inject(
compileAndLink('<ng:include src="tpl" autoscroll></ng:include>'),
changeTplAndValueTo('template.html'), function() {
expect(autoScrollSpy).toHaveBeenCalledOnce();
}));
it('should call $autoScroll if autoscroll evaluates to true', inject(
it('should call $anchorScroll if autoscroll evaluates to true', inject(
compileAndLink('<ng:include src="tpl" autoscroll="value"></ng:include>'),
changeTplAndValueTo('template.html', true),
changeTplAndValueTo('another.html', 'some-string'),
@@ -270,14 +270,14 @@ describe('widget', function() {
}));
it('should not call $autoScroll if autoscroll attribute is not present', inject(
it('should not call $anchorScroll if autoscroll attribute is not present', inject(
compileAndLink('<ng:include src="tpl"></ng:include>'),
changeTplAndValueTo('template.html'), function() {
expect(autoScrollSpy).not.toHaveBeenCalled();
}));
it('should not call $autoScroll if autoscroll evaluates to false', inject(
it('should not call $anchorScroll if autoscroll evaluates to false', inject(
compileAndLink('<ng:include src="tpl" autoscroll="value"></ng:include>'),
changeTplAndValueTo('template.html', false),
changeTplAndValueTo('template.html', undefined),