aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMisko Hevery2010-07-30 15:19:43 -0700
committerMisko Hevery2010-07-30 15:19:43 -0700
commit059703495dc703354056f1d16a73591959852370 (patch)
treeb1b44506a93124e7fe5c2cb66e2dfd40ca9282b4
parent1e1c8c82f98f4a6d6ed77e7bf34ac5177fe33d4f (diff)
downloadangular.js-059703495dc703354056f1d16a73591959852370.tar.bz2
rename textMarkup to markup
-rw-r--r--src/Angular.js2
-rw-r--r--src/Compiler.js6
-rw-r--r--test/CompilerSpec.js10
3 files changed, 9 insertions, 9 deletions
diff --git a/src/Angular.js b/src/Angular.js
index a6fc28b3..42e2ce89 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -18,7 +18,7 @@ var consoleNode,
slice = Array.prototype.slice,
error = window['console'] ? bind(window['console'], window['console']['error'] || noop) : noop,
angular = window['angular'] || (window['angular'] = {}),
- angularTextMarkup = extensionMap(angular, 'textMarkup'),
+ angularTextMarkup = extensionMap(angular, 'markup'),
angularAttrMarkup = extensionMap(angular, 'attrMarkup'),
angularDirective = extensionMap(angular, 'directive'),
angularWidget = extensionMap(angular, 'widget', lowercase),
diff --git a/src/Compiler.js b/src/Compiler.js
index bcf1f61a..e09f1876 100644
--- a/src/Compiler.js
+++ b/src/Compiler.js
@@ -69,8 +69,8 @@ Template.prototype = {
///////////////////////////////////
//Compiler
//////////////////////////////////
-function Compiler(textMarkup, attrMarkup, directives, widgets){
- this.textMarkup = textMarkup;
+function Compiler(markup, attrMarkup, directives, widgets){
+ this.markup = markup;
this.attrMarkup = attrMarkup;
this.directives = directives;
this.widgets = widgets;
@@ -158,7 +158,7 @@ Compiler.prototype = {
// process markup for text nodes only
eachTextNode(element, function(textNode){
var text = textNode.text();
- foreach(self.textMarkup, function(markup){
+ foreach(self.markup, function(markup){
markup.call(selfApi, text, textNode, element);
});
});
diff --git a/test/CompilerSpec.js b/test/CompilerSpec.js
index 3736ff4e..1091337b 100644
--- a/test/CompilerSpec.js
+++ b/test/CompilerSpec.js
@@ -1,5 +1,5 @@
describe('compiler', function(){
- var compiler, textMarkup, directives, widgets, compile, log;
+ var compiler, markup, directives, widgets, compile, log;
beforeEach(function(){
log = "";
@@ -20,10 +20,10 @@ describe('compiler', function(){
}
};
- textMarkup = [];
+ markup = [];
attrMarkup = [];
widgets = extensionMap({}, 'widget');
- compiler = new Compiler(textMarkup, attrMarkup, directives, widgets);
+ compiler = new Compiler(markup, attrMarkup, directives, widgets);
compile = function(html){
var e = jqLite("<div>" + html + "</div>");
var scope = compiler.compile(e)(e);
@@ -94,7 +94,7 @@ describe('compiler', function(){
});
it('should process markup before directives', function(){
- textMarkup.push(function(text, textNode, parentNode) {
+ markup.push(function(text, textNode, parentNode) {
if (text == 'middle') {
expect(textNode.text()).toEqual(text);
parentNode.attr('hello', text);
@@ -126,7 +126,7 @@ describe('compiler', function(){
this.directives(true);
return noop;
};
- textMarkup.push(function(text, textNode, parent){
+ markup.push(function(text, textNode, parent){
if (text == '{{1+2}}')
parent.text('3');
});