Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-05-25 14:23:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

allow the widget to change structure of the DOM and have the compiler follow the replaced element.

Browse source
This commit is contained in:
Misko Hevery 2010-04-26 11:57:33 -07:00
parent 076f37a5ec
commit 02fa10f93c
2 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Compiler.js
View file

@ -77,7 +77,7 @@ function Compiler(textMarkup, attrMarkup, directives, widgets){
Compiler.prototype = { Compiler.prototype = {
compile: function(rawElement) { compile: function(rawElement) {
rawElement = jqLite(rawElement); rawElement = jqLite(rawElement);
var template = this.templatize(rawElement) || new Template(); var template = this.templatize(rawElement, 0, 0) || new Template();
return function(element, parentScope){ return function(element, parentScope){
element = jqLite(element); element = jqLite(element);
var scope = parentScope && parentScope.$eval ? var scope = parentScope && parentScope.$eval ?
@ -95,7 +95,7 @@ Compiler.prototype = {
}; };
}, },
templatize: function(element, priority){ templatize: function(element, elementIndex, priority){
var self = this, var self = this,
widget, widget,
directiveFns = self.directives, directiveFns = self.directives,
@ -130,7 +130,11 @@ Compiler.prototype = {
if (widget) { if (widget) {
descend = false; descend = false;
directives = false; directives = false;
var parent = element.parent();
template.addInit(widget.call(selfApi, element)); template.addInit(widget.call(selfApi, element));
if (parent) {
element = jqLite(parent[0].childNodes[elementIndex]);
}
} }
if (descend){ if (descend){
// process markup for text nodes only // process markup for text nodes only
@ -156,7 +160,7 @@ Compiler.prototype = {
// Process non text child nodes // Process non text child nodes
if (descend) { if (descend) {
eachNode(element, function(child, i){ eachNode(element, function(child, i){
template.addChild(i, self.templatize(child, priority)); template.addChild(i, self.templatize(child, i, priority));
}); });
} }
return template.empty() ? null : template; return template.empty() ? null : template;

18
test/CompilerSpec.js
View file

@ -108,7 +108,7 @@ describe('compiler', function(){
it('should replace widgets', function(){ it('should replace widgets', function(){
widgets['NG:BUTTON'] = function(element) { widgets['NG:BUTTON'] = function(element) {
element.replaceWith('<div>button</div>', element); element.replaceWith('<div>button</div>');
return function(element) { return function(element) {
log += 'init'; log += 'init';
}; };
@ -118,4 +118,20 @@ describe('compiler', function(){
expect(log).toEqual('init'); expect(log).toEqual('init');
}); });
it('should use the replaced element after calling widget', function(){
widgets['H1'] = function(element) {
var span = angular.element('<span>{{1+2}}</span>');
element.replaceWith(span);
this.descend(true);
this.directives(true);
return noop;
};
textMarkup.push(function(text, textNode, parent){
if (text == '{{1+2}}')
textNode.text('3');
});
var scope = compile('<div><h1>ignore me</h1></div>');
expect(scope.$element.text()).toEqual('3');
});
}); });