From ee5e881b9ecf87f3fffd43fa00e20fb4233afb4b Mon Sep 17 00:00:00 2001
From: Elliott Sprehn
Date: Wed, 3 Nov 2010 11:47:06 -0700
Subject: Fix JSON serialization breakage in WebKit browsers

---
 src/JSON.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/JSON.js b/src/JSON.js
index b2647104..0cbe6b2d 100644
--- a/src/JSON.js
+++ b/src/JSON.js
@@ -34,7 +34,7 @@ function toJsonArray(buf, obj, pretty, stack){
   if (obj === _null) {
     buf.push($null);
   } else if (obj instanceof RegExp) {
-      buf.push(angular['String']['quoteUnicode'](obj.toString()));
+    buf.push(angular['String']['quoteUnicode'](obj.toString()));
   } else if (type === $function) {
     return;
   } else if (type === $boolean) {
@@ -55,7 +55,7 @@ function toJsonArray(buf, obj, pretty, stack){
       for(var i=0; i<len; i++) {
         var item = obj[i];
         if (sep) buf.push(",");
-        if (typeof item == $function || typeof item == $undefined) {
+        if (!(item instanceof RegExp) && (typeof item == $function || typeof item == $undefined)) {
           buf.push($null);
         } else {
           toJsonArray(buf, item, pretty, stack);
-- 
cgit v1.2.3