aboutsummaryrefslogtreecommitdiffstats
path: root/src/directives.js
diff options
context:
space:
mode:
authorMisko Hevery2011-01-13 10:35:26 -0800
committerMisko Hevery2011-01-14 10:30:00 -0800
commit347be5ae9aa6829427e1e8e1b1e58afdf2a36c0a (patch)
tree3b350a12378c1ec63f60cce0fe674186d204726e /src/directives.js
parent934f44f69e94a77a3ea6c19dc5c6f82ade2cc669 (diff)
downloadangular.js-347be5ae9aa6829427e1e8e1b1e58afdf2a36c0a.tar.bz2
fixed select with ng:format
select (one/multiple) could not chose from a list of objects, since DOM requires string ids. Solved by adding index formatter, which exposed incorrect handling of formatters in select widgets.
Diffstat (limited to 'src/directives.js')
-rw-r--r--src/directives.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/directives.js b/src/directives.js
index 8584df8b..10d1f1e5 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -197,7 +197,7 @@ angularDirective("ng:bind", function(expression, element){
if (lastValue === value && lastError == error) return;
isDomElement = isElement(value);
if (!isHtml && !isDomElement && isObject(value)) {
- value = toJson(value);
+ value = toJson(value, true);
}
if (value != lastValue || error != lastError) {
lastValue = value;
@@ -234,7 +234,7 @@ function compileBindTemplate(template){
return text;
});
});
- bindTemplateCache[template] = fn = function(element){
+ bindTemplateCache[template] = fn = function(element, prettyPrintJson){
var parts = [], self = this,
oldElement = this.hasOwnProperty($$element) ? self.$element : _undefined;
self.$element = element;
@@ -243,7 +243,7 @@ function compileBindTemplate(template){
if (isElement(value))
value = '';
else if (isObject(value))
- value = toJson(value, true);
+ value = toJson(value, prettyPrintJson);
parts.push(value);
}
self.$element = oldElement;
@@ -292,7 +292,7 @@ angularDirective("ng:bind-template", function(expression, element){
return function(element) {
var lastValue;
this.$onEval(function() {
- var value = templateFn.call(this, element);
+ var value = templateFn.call(this, element, true);
if (value != lastValue) {
element.text(value);
lastValue = value;