From 23b255a8b7481ff5c06004b3558c07f981c42276 Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Mon, 7 Feb 2011 15:29:56 -0800
Subject: remove $init on scope from applying compilation template
Closes #40
---
CHANGELOG.md | 8 ++++
src/Angular.js | 6 +--
src/Compiler.js | 20 ++++------
src/widgets.js | 19 +++++-----
test/BinderSpec.js | 31 ++++++++--------
test/CompilerSpec.js | 5 +--
test/ScenarioSpec.js | 9 ++---
test/ValidatorsSpec.js | 5 +--
test/directivesSpec.js | 3 +-
test/markupSpec.js | 1 -
test/testabilityPatch.js | 1 +
test/widgetsSpec.js | 95 +++++++++++++++++++++++-------------------------
12 files changed, 95 insertions(+), 108 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index de7b3f4f..979d2435 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,14 @@
var scope1 = angular.compile(window.document);
- scope1.$init();
var scope2 = angular.compile('click me
');
- scope2.$init();
*
* @param {string|DOMElement} element Element to compile.
@@ -948,7 +946,7 @@ function toKeyValue(obj) {
(function(window, previousOnLoad){
window.onload = function(){
try { (previousOnLoad||angular.noop)(); } catch(e) {}
- angular.compile(window.document).$init();
+ angular.compile(window.document);
};
})(window, window.onload);
</script>
@@ -1002,8 +1000,6 @@ function angularInit(config){
$browser.addCss(config.base_url + config.css);
else if(msie<8)
$browser.addJs(config.base_url + config.ie_compat, config.ie_compat_id);
-
- scope.$init();
}
}
diff --git a/src/Compiler.js b/src/Compiler.js
index 804a9622..6aee40b8 100644
--- a/src/Compiler.js
+++ b/src/Compiler.js
@@ -13,7 +13,7 @@ function Template(priority) {
}
Template.prototype = {
- init: function(element, scope) {
+ attach: function(element, scope) {
var inits = {};
this.collectInits(element, inits, scope);
forEachSorted(inits, function(queue){
@@ -96,18 +96,14 @@ Compiler.prototype = {
template = this.templatize(element, index, 0) || new Template();
return function(element, parentScope){
element = jqLite(element);
- var scope = parentScope && parentScope.$eval ?
- parentScope : createScope(parentScope);
+ var scope = parentScope && parentScope.$eval
+ ? parentScope
+ : createScope(parentScope);
element.data($$scope, scope);
- return extend(scope, {
- $element:element,
- $init: function() {
- template.init(element, scope);
- scope.$eval();
- delete scope.$init;
- return scope;
- }
- });
+ template.attach(element, scope);
+ scope.$element = element;
+ scope.$eval();
+ return scope;
};
},
diff --git a/src/widgets.js b/src/widgets.js
index 7438254d..66c9ecc5 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -677,7 +677,6 @@ angularWidget('ng:include', function(element){
element.html(response);
childScope = useScope || createScope(scope);
compiler.compile(element)(element, childScope);
- childScope.$init();
scope.$eval(onloadExp);
});
} else {
@@ -795,7 +794,6 @@ var ngSwitch = angularWidget('ng:switch', function (element){
element.append(caseElement);
childScope.$tryEval(switchCase.change, element);
switchCase.template(caseElement, childScope);
- childScope.$init();
}
});
});
@@ -891,7 +889,7 @@ angularWidget('a', function() {
angularWidget("@ng:repeat", function(expression, element){
element.removeAttr('ng:repeat');
element.replaceWith(jqLite(""));
- var template = this.compile(element);
+ var linker = this.compile(element);
return function(reference){
var match = expression.match(/^\s*(.+)\s+in\s+(.*)\s*$/),
lhs, rhs, valueIdent, keyIdent;
@@ -912,6 +910,7 @@ angularWidget("@ng:repeat", function(expression, element){
var children = [], currentScope = this;
this.$onEval(function(){
var index = 0,
+ cloneElement,
childCount = children.length,
lastElement = reference,
collection = this.$tryEval(rhs, reference),
@@ -937,16 +936,17 @@ angularWidget("@ng:repeat", function(expression, element){
if (keyIdent) childScope[keyIdent] = key;
} else {
// grow children
- childScope = template(quickClone(element), createScope(currentScope));
+ childScope = createScope(currentScope);
childScope[valueIdent] = collection[key];
if (keyIdent) childScope[keyIdent] = key;
- lastElement.after(childScope.$element);
childScope.$index = index;
childScope.$position = index == 0 ?
- 'first' :
- (index == collectionLength - 1 ? 'last' : 'middle');
- childScope.$element.attr('ng:repeat-index', index);
- childScope.$init();
+ 'first' :
+ (index == collectionLength - 1 ? 'last' : 'middle');
+ cloneElement = quickClone(element);
+ lastElement.after(cloneElement);
+ cloneElement.attr('ng:repeat-index', index);
+ linker(cloneElement, childScope);
children.push(childScope);
}
childScope.$eval();
@@ -1069,7 +1069,6 @@ angularWidget('ng:view', function(element) {
$xhr('GET', src, function(code, response){
element.html(response);
compiler.compile(element)(element, childScope);
- childScope.$init();
});
} else {
element.html('');
diff --git a/test/BinderSpec.js b/test/BinderSpec.js
index 73650bd6..c3f90ad7 100644
--- a/test/BinderSpec.js
+++ b/test/BinderSpec.js
@@ -3,16 +3,18 @@ describe('Binder', function(){
beforeEach(function(){
var self = this;
- this.compile = function(html, initialScope, parent) {
+ this.compile = function(html, parent) {
var compiler = new Compiler(angularTextMarkup, angularAttrMarkup, angularDirective, angularWidget);
if (self.element) dealoc(self.element);
- var element = self.element = jqLite(html);
+ var element;
+ if (parent) {
+ parent.html(html);
+ element = parent.children();
+ } else {
+ element = jqLite(html);
+ }
+ self.element = element;
var scope = compiler.compile(element)(element);
-
- if (parent) parent.append(element);
-
- extend(scope, initialScope);
- scope.$init();
return {node:element, scope:scope};
};
this.compileToHtml = function (content) {
@@ -27,8 +29,8 @@ describe('Binder', function(){
});
- it('ChangingTextfieldUpdatesModel', function(){
- var state = this.compile('Add Phone ', model);
+ var c = this.compile('Add Phone ');
c.scope.action = function(){
throw new Error('MyError');
};
@@ -517,9 +518,9 @@ describe('Binder', function(){
});
it('ValidateForm', function(){
- var c = this.compile('',
- undefined, jqLite(document.body));
+ var c = this.compile('
',
+ jqLite(document.body));
var items = [{}, {}];
c.scope.$set("items", items);
c.scope.$eval();
@@ -547,7 +548,7 @@ describe('Binder', function(){
});
it('ValidateOnlyVisibleItems', function(){
- var c = this.compile('
', undefined, jqLite(document.body));
+ var c = this.compile('
', jqLite(document.body));
c.scope.$set("show", true);
c.scope.$eval();
assertEquals(2, c.scope.$service('$invalidWidgets').length);
diff --git a/test/CompilerSpec.js b/test/CompilerSpec.js
index 291a5011..647cc366 100644
--- a/test/CompilerSpec.js
+++ b/test/CompilerSpec.js
@@ -28,7 +28,6 @@ describe('compiler', function(){
compile = function(html){
var e = jqLite("" + html + "
");
var scope = compiler.compile(e)(e);
- scope.$init();
return scope;
};
});
@@ -48,10 +47,8 @@ describe('compiler', function(){
};
};
var template = compiler.compile(e);
- scope = template(e);
- var init = scope.$init;
expect(log).toEqual("found");
- init();
+ scope = template(e);
expect(e.hasClass('ng-directive')).toEqual(true);
expect(log).toEqual("found:init");
});
diff --git a/test/ScenarioSpec.js b/test/ScenarioSpec.js
index 50b5e51c..cd1e3115 100644
--- a/test/ScenarioSpec.js
+++ b/test/ScenarioSpec.js
@@ -13,25 +13,24 @@ describe("ScenarioSpec: Compilation", function(){
it("should compile dom node and return scope", function(){
var node = jqLite('{{b=a+1}}
')[0];
scope = compile(node);
- scope.$init();
expect(scope.a).toEqual(1);
expect(scope.b).toEqual(2);
});
it("should compile jQuery node and return scope", function(){
- scope = compile(jqLite('{{a=123}}
')).$init();
+ scope = compile(jqLite('{{a=123}}
'));
expect(jqLite(scope.$element).text()).toEqual('123');
});
it("should compile text node and return scope", function(){
- scope = compile('{{a=123}}
').$init();
+ scope = compile('{{a=123}}
');
expect(jqLite(scope.$element).text()).toEqual('123');
});
});
describe('scope', function(){
- it("should have set, get, eval, $init, updateView methods", function(){
- scope = compile('{{a}}
').$init();
+ it("should have $set, $get, $eval, $updateView methods", function(){
+ scope = compile('{{a}}
');
scope.$eval("$invalidWidgets.push({})");
expect(scope.$set("a", 2)).toEqual(2);
expect(scope.$get("a")).toEqual(2);
diff --git a/test/ValidatorsSpec.js b/test/ValidatorsSpec.js
index 60d20418..65b93133 100644
--- a/test/ValidatorsSpec.js
+++ b/test/ValidatorsSpec.js
@@ -9,7 +9,7 @@ describe('ValidatorTest', function(){
};
var scope = compile('' +
'{{opt}} ' +
' ',
- undefined, jqLite(document.body));
+ jqLite(document.body));
scope.selection = 1;
scope.options = ['one', 'two'];
scope.$eval();
@@ -492,14 +486,13 @@ describe("widget", function(){
});
it('should allow binding to objects through index', function(){
- compile('' +
- 'A ' +
- 'B ' +
- 'C ' +
- ' ',
- function(){
- scope.list = [{name:'A'}, {name:'B'}, {name:'C'}];
- });
+ compile('' +
+ '' +
+ 'A ' +
+ 'B ' +
+ 'C ' +
+ ' ' +
+ '
');
scope.$eval();
expect(scope.selection).toEqual([{name:'A'}, {name:'B'}]);
});
@@ -517,14 +510,13 @@ describe("widget", function(){
});
it('should be contain the selected object', function(){
- compile('' +
- 'A ' +
- 'B ' +
- 'C ' +
- ' ',
- function(){
- scope.list = [{name:'A'}, {name:'B'}, {name:'C'}];
- });
+ compile('' +
+ '' +
+ 'A ' +
+ 'B ' +
+ 'C ' +
+ ' ' +
+ '
');
scope.$eval();
expect(scope.selection).toEqual([{name:'B'}]);
});
@@ -604,7 +596,7 @@ describe("widget", function(){
it('should call change on switch', function(){
var scope = angular.compile('{{name}}
include:
');
- $browser = rootScope.$service('$browser');
+ var myApp = angular.scope();
+ var $browser = myApp.$service('$browser');
$browser.xhr.expectGET('includePartial.html').respond('view: ' +
+ 'include: ' +
+ '
', myApp);
$browser.xhr.expectGET('viewPartial.html').respond('content');
$browser.xhr.flush();
--
cgit v1.2.3