aboutsummaryrefslogtreecommitdiffstats
path: root/src/directives.js
diff options
context:
space:
mode:
authorMisko Hevery2010-05-10 10:36:06 -0700
committerMisko Hevery2010-05-10 10:36:06 -0700
commitf5027cc375cf29d8a78679297d9f6bdca9567eb7 (patch)
treef415af2b615656562c1d1ac10fe9b4aab83b54c7 /src/directives.js
parent4542716370ac52f385795f509436104a2a3501d2 (diff)
parent664f1c56876f00b885272c39f759641271eef1dc (diff)
downloadangular.js-f5027cc375cf29d8a78679297d9f6bdca9567eb7.tar.bz2
Merge branch 'master' of github.com:angular/angular.js
Diffstat (limited to 'src/directives.js')
-rw-r--r--src/directives.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/directives.js b/src/directives.js
index d9cf7962..a3575d62 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -30,8 +30,9 @@ angularDirective("ng-bind", function(expression){
value = this.$tryEval(expression, function(e){
error = toJson(e);
}),
- isHtml = value instanceof HTML;
- if (!isHtml && isObject(value)) {
+ isHtml = value instanceof HTML,
+ isDomElement = isElement(value);
+ if (!isHtml && !isDomElement && isObject(value)) {
value = toJson(value);
}
if (value != lastValue || error != lastError) {
@@ -41,6 +42,9 @@ angularDirective("ng-bind", function(expression){
if (error) value = error;
if (isHtml) {
element.html(value.html);
+ } else if (isDomElement) {
+ element.html('');
+ element.append(value);
} else {
element.text(value);
}