added support for .toJSON to the rison encoder. This allows us to put…

… complex objects in the state and have them encoded sanely
elastic · Apr 24, 2014 · b57be6b · b57be6b
1 parent 7c5df8d
commit b57be6b
Showing 1 changed file with 18 additions and 24 deletions.
diff --git a/src/kibana/utils/rison.js b/src/kibana/utils/rison.js
@@ -115,21 +115,22 @@ rison.quote = function(x) {
     var sq = { // url-ok but quoted in strings
                "'": true,  '!': true
     },
+    enc = function (v) {
+        if (v && typeof v.toJSON === 'function') v = v.toJSON();
+        var fn = s[typeof v];
+        if (fn) return fn(v);
+    },
     s = {
             array: function (x) {
                 var a = ['!('], b, f, i, l = x.length, v;
                 for (i = 0; i < l; i += 1) {
-                    v = x[i];
-                    f = s[typeof v];
-                    if (f) {
-                        v = f(v);
-                        if (typeof v == 'string') {
-                            if (b) {
-                                a[a.length] = ',';
-                            }
-                            a[a.length] = v;
-                            b = true;
+                    v = enc(x[i]);
+                    if (typeof v == 'string') {
+                        if (b) {
+                            a[a.length] = ',';
                         }
+                        a[a.length] = v;
+                        b = true;
                     }
                 }
                 a[a.length] = ')';
@@ -154,27 +155,20 @@ rison.quote = function(x) {
                     if (x instanceof Array) {
                         return s.array(x);
                     }
-                    // WILL: will this work on non-Firefox browsers?
-                    if (typeof x.__prototype__ === 'object' && typeof x.__prototype__.encode_rison !== 'undefined')
-                        return x.encode_rison();
 
                     var a = ['('], b, f, i, v, ki, ks=[];
                     for (i in x)
                         ks[ks.length] = i;
                     ks.sort();
                     for (ki = 0; ki < ks.length; ki++) {
                         i = ks[ki];
-                        v = x[i];
-                        f = s[typeof v];
-                        if (f) {
-                            v = f(v);
-                            if (typeof v == 'string') {
-                                if (b) {
-                                    a[a.length] = ',';
-                                }
-                                a.push(s.string(i), ':', v);
-                                b = true;
+                        v = enc(x[i]);
+                        if (typeof v == 'string') {
+                            if (b) {
+                                a[a.length] = ',';
                             }
+                            a.push(s.string(i), ':', v);
+                            b = true;
                         }
                     }
                     a[a.length] = ')';
@@ -209,7 +203,7 @@ rison.quote = function(x) {
      *
      */
     rison.encode = function (v) {
-        return s[typeof v](v);
+        return enc(v);
     };
 
     /**