kylefang/angular.js
1
0
Fork 0
mirror of https://github.com/zhigang1992/angular.js.git synced 2026-06-16 18:29:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(ngSwitch): interoperate with multi-element transclude directives

Browse Source 
Worked with @lgalfaso on the implementation here.

Closes #8235
Closes #8244
This commit is contained in:
Peter Bacon Darwin
2014-07-17 22:10:50 +01:00
parent 4f32e3eef1
commit c20d438ac9
2 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ng/directive/ngSwitch.js
View File

@@ -152,7 +152,7 @@ var ngSwitchDirective = ['$animate', function($animate) {
previousElements.length = 0;
for (i = 0, ii = selectedScopes.length; i < ii; ++i) {
var selected = selectedElements[i];
var selected = getBlockElements(selectedElements[i].clone);
selectedScopes[i].$destroy();
previousElements[i] = selected;
$animate.leave(selected, function() {
@@ -169,8 +169,10 @@ var ngSwitchDirective = ['$animate', function($animate) {
selectedTransclude.transclude(function(caseElement, selectedScope) {
selectedScopes.push(selectedScope);
var anchor = selectedTransclude.element;
caseElement[caseElement.length++] = document.createComment(' end ngSwitchWhen: ');
var block = { clone: caseElement };
selectedElements.push(caseElement);
selectedElements.push(block);
$animate.enter(caseElement, anchor.parent(), anchor);
});
});

35
test/ng/directive/ngSwitchSpec.js
View File

@@ -251,25 +251,28 @@ describe('ngSwitch', function() {
}));
it("should use the correct transclusion scope if there is a transclude directive on the ng-swith-when/ng-switch-default element", inject(function($rootScope, $compile) {
it("should interoperate with other transclusion directives like ngRepeat", inject(function($rootScope, $compile) {
element = $compile(
'<div ng-switch="foo">' +
'<pre ng-switch-when="item1" ng-repeat="bar in bars">' +
'foo = {{foo}}' +
'bar = {{bar}}' +
'$index = {{$index}}' +
'</pre>' +
'<div ng-switch="value">' +
'<div ng-switch-when="foo" ng-repeat="foo in foos">{{value}}:{{foo}}|</div>' +
'<div ng-switch-default ng-repeat="bar in bars">{{value}}:{{bar}}|</div>' +
'</div>'
)($rootScope);
$rootScope.$apply('foo="item1";bars=["one", "two"]');
expect(element.text()).toEqual(
'foo = item1' +
'bar = one' +
'$index = 0' +
'foo = item1' +
'bar = two' +
'$index = 1'
);
$rootScope.$apply('value="foo";foos=["one", "two"]');
expect(element.text()).toEqual('foo:one|foo:two|');
$rootScope.$apply('value="foo";foos=["one"]');
expect(element.text()).toEqual('foo:one|');
$rootScope.$apply('value="foo";foos=["one","two","three"]');
expect(element.text()).toEqual('foo:one|foo:two|foo:three|');
$rootScope.$apply('value="bar";bars=["up", "down"]');
expect(element.text()).toEqual('bar:up|bar:down|');
$rootScope.$apply('value="bar";bars=["up", "down", "forwards", "backwards"]');
expect(element.text()).toEqual('bar:up|bar:down|bar:forwards|bar:backwards|');
}));