diff options
| author | Misko Hevery | 2011-01-13 10:35:26 -0800 | 
|---|---|---|
| committer | Misko Hevery | 2011-01-14 10:30:00 -0800 | 
| commit | 347be5ae9aa6829427e1e8e1b1e58afdf2a36c0a (patch) | |
| tree | 3b350a12378c1ec63f60cce0fe674186d204726e /src/JSON.js | |
| parent | 934f44f69e94a77a3ea6c19dc5c6f82ade2cc669 (diff) | |
| download | angular.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/JSON.js')
| -rw-r--r-- | src/JSON.js | 2 | 
1 files changed, 1 insertions, 1 deletions
| 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; | 
