Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

fix(ngView): IE8 regression due to expando on non-element nodes #4072

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/ngRoute/directive/ngView.js
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ function ngViewFactory( $route, $anchorScroll, $compile, $controller,
currentScope[current.controllerAs] = controller;
}
clone.data('$ngControllerController', controller);
clone.contents().data('$ngControllerController', controller);
clone.children().data('$ngControllerController', controller);
}

link(currentScope);
Expand Down
9 changes: 6 additions & 3 deletions test/ngRoute/directive/ngViewSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ describe('ngView', function() {
});


it('should set $scope and $controllerController on the view', function() {
it('should set $scope and $controllerController on the view elements (except for non-element nodes)', function() {
function MyCtrl($scope) {
$scope.state = 'WORKS';
$scope.ctrl = this;
Expand All @@ -466,11 +466,14 @@ describe('ngView', function() {
});

inject(function($templateCache, $location, $rootScope, $route) {
$templateCache.put('tpl.html', [200, '<div>{{state}}</div>', {}]);
// in the template the white-space before the div is an intentional non-element node,
// a text might get wrapped into span so it's safer to just use white space
$templateCache.put('tpl.html', [200, ' \n <div>{{state}}</div>', {}]);

$location.url('/foo');
$rootScope.$digest();
expect(element.text()).toEqual('WORKS');
// using toMatch because in IE8+jquery the space doesn't get preserved. jquery bug?
expect(element.text()).toMatch(/\s*WORKS/);

var div = element.find('div');
expect(div.parent()[0].nodeName.toUpperCase()).toBeOneOf('NG:VIEW', 'VIEW');
Expand Down