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

Fix 836 1166 #1494

Closed
wants to merge 5 commits into from
Closed

Fix 836 1166 #1494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
69bbb16
fix($compile): prevent double attr interpolation w/ templateUrl
IgorMinar Oct 25, 2012
9c74a65
refactor(): simplify nodeLinkFn
IgorMinar Oct 25, 2012
f3d6fc8
style($compile): better fn names for debugging
IgorMinar Oct 25, 2012
13d36ea
fix($compile): compilation should not resurse below empty nodes
IgorMinar Oct 25, 2012
336c70c
fix($compile): don't look for class directives in empty string
IgorMinar Oct 25, 2012
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
53 changes: 27 additions & 26 deletions src/ng/compile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,26 +310,26 @@ function $CompileProvider($provide) {

//================================

function compile($compileNode, transcludeFn, maxPriority) {
if (!($compileNode instanceof jqLite)) {
function compile($compileNodes, transcludeFn, maxPriority) {
if (!($compileNodes instanceof jqLite)) {
// jquery always rewraps, where as we need to preserve the original selector so that we can modify it.
$compileNode = jqLite($compileNode);
$compileNodes = jqLite($compileNodes);
}
// We can not compile top level text elements since text nodes can be merged and we will
// not be able to attach scope data to them, so we will wrap them in <span>
forEach($compileNode, function(node, index){
forEach($compileNodes, function(node, index){
if (node.nodeType == 3 /* text node */) {
$compileNode[index] = jqLite(node).wrap('<span></span>').parent()[0];
$compileNodes[index] = jqLite(node).wrap('<span></span>').parent()[0];
}
});
var compositeLinkFn = compileNodes($compileNode, transcludeFn, $compileNode, maxPriority);
return function(scope, cloneConnectFn){
var compositeLinkFn = compileNodes($compileNodes, transcludeFn, $compileNodes, maxPriority);
return function publicLinkFn(scope, cloneConnectFn){
assertArg(scope, 'scope');
// important!!: we must call our jqLite.clone() since the jQuery one is trying to be smart
// and sometimes changes the structure of the DOM.
var $linkNode = cloneConnectFn
? JQLitePrototype.clone.call($compileNode) // IMPORTANT!!!
: $compileNode;
? JQLitePrototype.clone.call($compileNodes) // IMPORTANT!!!
: $compileNodes;
$linkNode.data('$scope', scope);
safeAddClass($linkNode, 'ng-scope');
if (cloneConnectFn) cloneConnectFn($linkNode, scope);
Expand Down Expand Up @@ -380,7 +380,7 @@ function $CompileProvider($provide) {
? applyDirectivesToNode(directives, nodeList[i], attrs, transcludeFn, $rootElement)
: null;

childLinkFn = (nodeLinkFn && nodeLinkFn.terminal)
childLinkFn = (nodeLinkFn && nodeLinkFn.terminal || !nodeList[i].childNodes.length)
? null
: compileNodes(nodeList[i].childNodes,
nodeLinkFn ? nodeLinkFn.transclude : transcludeFn);
Expand Down Expand Up @@ -432,13 +432,14 @@ function $CompileProvider($provide) {


/**
* Looks for directives on the given node ands them to the directive collection which is sorted.
* Looks for directives on the given node and adds them to the directive collection which is
* sorted.
*
* @param node node to search
* @param directives an array to which the directives are added to. This array is sorted before
* @param node Node to search.
* @param directives An array to which the directives are added to. This array is sorted before
* the function returns.
* @param attrs the shared attrs object which is used to populate the normalized attributes.
* @param {number=} max directive priority
* @param attrs The shared attrs object which is used to populate the normalized attributes.
* @param {number=} maxPriority Max directive priority.
*/
function collectDirectives(node, directives, attrs, maxPriority) {
var nodeType = node.nodeType,
Expand Down Expand Up @@ -473,7 +474,7 @@ function $CompileProvider($provide) {

// use class as directive
className = node.className;
if (isString(className)) {
if (isString(className) && className !== '') {
while (match = CLASS_DIRECTIVE_REGEXP.exec(className)) {
nName = directiveNormalize(match[2]);
if (addDirective(directives, nName, 'C', maxPriority)) {
Expand Down Expand Up @@ -527,7 +528,7 @@ function $CompileProvider($provide) {
preLinkFns = [],
postLinkFns = [],
newScopeDirective = null,
newIsolatedScopeDirective = null,
newIsolateScopeDirective = null,
templateDirective = null,
$compileNode = templateAttrs.$$element = jqLite(compileNode),
directive,
Expand All @@ -549,10 +550,10 @@ function $CompileProvider($provide) {
}

if (directiveValue = directive.scope) {
assertNoDuplicate('isolated scope', newIsolatedScopeDirective, directive, $compileNode);
assertNoDuplicate('isolated scope', newIsolateScopeDirective, directive, $compileNode);
if (isObject(directiveValue)) {
safeAddClass($compileNode, 'ng-isolate-scope');
newIsolatedScopeDirective = directive;
newIsolateScopeDirective = directive;
}
safeAddClass($compileNode, 'ng-scope');
newScopeDirective = newScopeDirective || directive;
Expand Down Expand Up @@ -706,12 +707,12 @@ function $CompileProvider($provide) {
}
$element = attrs.$$element;

if (newScopeDirective && isObject(newScopeDirective.scope)) {
if (newIsolateScopeDirective) {
var LOCAL_REGEXP = /^\s*([@=&])\s*(\w*)\s*$/;

var parentScope = scope.$parent || scope;

forEach(newScopeDirective.scope, function(definiton, scopeName) {
forEach(newIsolateScopeDirective.scope, function(definiton, scopeName) {
var match = definiton.match(LOCAL_REGEXP) || [],
attrName = match[2]|| scopeName,
mode = match[1], // @, =, or &
Expand All @@ -734,7 +735,7 @@ function $CompileProvider($provide) {
// reset the change, or we will throw this exception on every $digest
lastValue = scope[scopeName] = parentGet(parentScope);
throw Error(NON_ASSIGNABLE_MODEL_EXPRESSION + attrs[attrName] +
' (directive: ' + newScopeDirective.name + ')');
' (directive: ' + newIsolateScopeDirective.name + ')');
};
lastValue = scope[scopeName] = parentGet(parentScope);
scope.$watch(function parentValueWatch() {
Expand Down Expand Up @@ -765,7 +766,7 @@ function $CompileProvider($provide) {

default: {
throw Error('Invalid isolate scope definition for directive ' +
newScopeDirective.name + ': ' + definiton);
newIsolateScopeDirective.name + ': ' + definiton);
}
}
});
Expand Down Expand Up @@ -899,7 +900,7 @@ function $CompileProvider($provide) {
origAsyncDirective = directives.shift(),
// The fact that we have to copy and patch the directive seems wrong!
derivedSyncDirective = extend({}, origAsyncDirective, {
controller: null, templateUrl: null, transclude: null
controller: null, templateUrl: null, transclude: null, scope: null
});

$compileNode.html('');
Expand Down Expand Up @@ -991,7 +992,7 @@ function $CompileProvider($provide) {
if (interpolateFn) {
directives.push({
priority: 0,
compile: valueFn(function(scope, node) {
compile: valueFn(function textInterpolateLinkFn(scope, node) {
var parent = node.parent(),
bindings = parent.data('$binding') || [];
bindings.push(interpolateFn);
Expand All @@ -1014,7 +1015,7 @@ function $CompileProvider($provide) {

directives.push({
priority: 100,
compile: valueFn(function(scope, element, attr) {
compile: valueFn(function attrInterpolateLinkFn(scope, element, attr) {
var $$observers = (attr.$$observers || (attr.$$observers = {}));

if (name === 'class') {
Expand Down
33 changes: 33 additions & 0 deletions test/ng/compileSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1048,6 +1048,39 @@ describe('$compile', function() {
expect($exceptionHandler.errors).toEqual([]);
});
});


it('should resume delayed compilation without duplicates when in a repeater', function() {
// this is a test for a regression
// scope creation, isolate watcher setup, controller instantiation, etc should happen
// only once even if we are dealing with delayed compilation of a node due to templateUrl
// and the template node is in a repeater

var controllerSpy = jasmine.createSpy('controller');

module(function($compileProvider) {
$compileProvider.directive('delayed', valueFn({
controller: controllerSpy,
templateUrl: 'delayed.html',
scope: {
title: '@'
}
}));
});

inject(function($templateCache, $compile, $rootScope) {
$rootScope.coolTitle = 'boom!';
$templateCache.put('delayed.html', '<div>{{title}}</div>');
element = $compile(
'<div><div ng-repeat="i in [1,2]"><div delayed title="{{coolTitle + i}}"></div>|</div></div>'
)($rootScope);

$rootScope.$apply();

expect(controllerSpy.callCount).toBe(2);
expect(element.text()).toBe('boom!1|boom!2|');
});
});
});


Expand Down