From 347be5ae9aa6829427e1e8e1b1e58afdf2a36c0a Mon Sep 17 00:00:00 2001
From: Misko Hevery
Date: Thu, 13 Jan 2011 10:35:26 -0800
Subject: 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.
---
 src/JSON.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/JSON.js')

diff --git a/src/JSON.js b/src/JSON.js
index 0d23314f..9a2b34e5 100644
--- a/src/JSON.js
+++ b/src/JSON.js
@@ -33,7 +33,7 @@ function toJson(obj, pretty) {
  * @returns {Object|Array|Date|string|number} Deserialized thingy.
  */
 function fromJson(json, useNative) {
-  if (!json) return json;
+  if (!isString(json)) return json;
 
   var obj, p, expression;
 
-- 
cgit v1.2.3