diff options
| author | Misko Hevery | 2010-04-20 18:14:13 -0700 |
|---|---|---|
| committer | Misko Hevery | 2010-04-20 18:14:13 -0700 |
| commit | 22d93e0a3bc2a6dc0f64c63c68bc8f8489ea9068 (patch) | |
| tree | 5f65b04ac9fb5a69d87ac40434a14367e6c1d4fc /src/directives.js | |
| parent | 259c2bba4bf1fc4f0d4cf5bcda4ffef0fb5a615a (diff) | |
| download | angular.js-22d93e0a3bc2a6dc0f64c63c68bc8f8489ea9068.tar.bz2 | |
fixes to enable ie
Diffstat (limited to 'src/directives.js')
| -rw-r--r-- | src/directives.js | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/directives.js b/src/directives.js index a37076d4..2f393b5d 100644 --- a/src/directives.js +++ b/src/directives.js @@ -26,15 +26,20 @@ angularDirective("ng-bind", function(expression){ return function(element) { var lastValue, lastError; this.$onEval(function() { - var error, value = this.$tryEval(expression, function(e){ - error = toJson(e); - }); + var error, + value = this.$tryEval(expression, function(e){ + error = toJson(e); + }), + isElem = isElement(value); + if (!isElem && isObject(value)) { + value = toJson(value); + } if (value != lastValue || error != lastError) { lastValue = value; lastError = error; elementError(element, NG_EXCEPTION, error); if (error) value = error; - if (isElement(value)) { + if (isElem) { element.html(''); element.append(value); } else { @@ -177,7 +182,7 @@ angularWidget("@ng-repeat", function(expression, element){ angularDirective("ng-click", function(expression, element){ return function(element){ var self = this; - element.click(function(){ + element.bind('click', function(){ self.$tryEval(expression, element); self.$root.$eval(); return false; |
