From fe434307d15d697a5ffade51bad068f6443965b2 Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Thu, 22 Apr 2010 17:11:56 -0700 Subject: tests work under jquery and without --- src/directives.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/directives.js') 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); } -- cgit v1.2.3