mirror of
https://github.com/Hopiu/angular.js.git
synced 2026-03-16 23:30:23 +00:00
fix($compile): handle elements with no childNodes property
see the test for more details
This commit is contained in:
parent
802bfc259c
commit
4759aacba9
2 changed files with 23 additions and 1 deletions
|
|
@ -433,7 +433,7 @@ function $CompileProvider($provide) {
|
|||
? applyDirectivesToNode(directives, nodeList[i], attrs, transcludeFn, $rootElement)
|
||||
: null;
|
||||
|
||||
childLinkFn = (nodeLinkFn && nodeLinkFn.terminal || !nodeList[i].childNodes.length)
|
||||
childLinkFn = (nodeLinkFn && nodeLinkFn.terminal || !nodeList[i].childNodes || !nodeList[i].childNodes.length)
|
||||
? null
|
||||
: compileNodes(nodeList[i].childNodes,
|
||||
nodeLinkFn ? nodeLinkFn.transclude : transcludeFn);
|
||||
|
|
|
|||
|
|
@ -178,6 +178,28 @@ describe('$compile', function() {
|
|||
expect(calcCacheSize()).toEqual(0);
|
||||
});
|
||||
|
||||
|
||||
it('should not blow up when elements with no childNodes property are compiled', inject(
|
||||
function($compile, $rootScope) {
|
||||
// it turns out that when a browser plugin is bound to an DOM element (typically <object>),
|
||||
// the plugin's context rather than the usual DOM apis are exposed on this element, so
|
||||
// childNodes might not exist.
|
||||
if (msie < 9) return;
|
||||
|
||||
element = jqLite('<div>{{1+2}}</div>');
|
||||
element[0].childNodes[1] = {nodeType: 3, nodeName: 'OBJECT', textContent: 'fake node'};
|
||||
|
||||
if (!element[0].childNodes[1]) return; //browser doesn't support this kind of mocking
|
||||
expect(element[0].childNodes[1].textContent).toBe('fake node');
|
||||
|
||||
$compile(element)($rootScope);
|
||||
$rootScope.$apply();
|
||||
|
||||
// object's children can't be compiled in this case, so we expect them to be raw
|
||||
expect(element.html()).toBe("3");
|
||||
}));
|
||||
|
||||
|
||||
describe('multiple directives per element', function() {
|
||||
it('should allow multiple directives per element', inject(function($compile, $rootScope, log){
|
||||
element = $compile(
|
||||
|
|
|
|||
Loading…
Reference in a new issue