diff options
| author | Misko Hevery | 2010-05-07 13:43:54 -0700 |
|---|---|---|
| committer | Misko Hevery | 2010-05-07 13:43:54 -0700 |
| commit | 0305b6746e2c50960b042c5d687794e030930f8b (patch) | |
| tree | ad8d670fad3a7ba93bc0efd443a5308e8a065235 /src/directives.js | |
| parent | 038a743e6f49c347a38edc0e54dcbb175905a475 (diff) | |
| download | angular.js-0305b6746e2c50960b042c5d687794e030930f8b.tar.bz2 | |
change everything over to jasmine
Diffstat (limited to 'src/directives.js')
| -rw-r--r-- | src/directives.js | 8 |
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); } |
