diff options
| author | Misko Hevery | 2010-04-22 17:11:56 -0700 |
|---|---|---|
| committer | Misko Hevery | 2010-04-22 17:11:56 -0700 |
| commit | fe434307d15d697a5ffade51bad068f6443965b2 (patch) | |
| tree | 64ca5ea2afee38d79ac973ffad4bf6902d6449a6 /src/directives.js | |
| parent | 2a9669e1d853d4e18d2eb1f07e84ee5baec838c2 (diff) | |
| download | angular.js-fe434307d15d697a5ffade51bad068f6443965b2.tar.bz2 | |
tests work under jquery and without
Diffstat (limited to 'src/directives.js')
| -rw-r--r-- | src/directives.js | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/directives.js b/src/directives.js index bdcdcc1d..aa75aa5b 100644 --- a/src/directives.js +++ b/src/directives.js @@ -30,8 +30,8 @@ angularDirective("ng-bind", function(expression){ value = this.$tryEval(expression, function(e){ error = toJson(e); }), - isElem = isElement(value); - if (!isElem && isObject(value)) { + isHtml = value instanceof HTML; + if (!isHtml && isObject(value)) { value = toJson(value); } if (value != lastValue || error != lastError) { @@ -39,9 +39,8 @@ angularDirective("ng-bind", function(expression){ lastError = error; elementError(element, NG_EXCEPTION, error); if (error) value = error; - if (isElem) { - element.html(''); - element.append(value); + if (isHtml) { + element.html(value.html); } else { element.text(value); } |
