Update Keys to be JSON instead of trying to configure that for the user

2 files changed, 4 insertions, 42 deletions

diff --git a/src/fauxton/app/addons/documents/templates/advanced_options.html b/src/fauxton/app/addons/documents/templates/advanced_options.html
index 8e78bcba7..4ca8f12a4 100644
--- a/src/fauxton/app/addons/documents/templates/advanced_options.html
+++ b/src/fauxton/app/addons/documents/templates/advanced_options.html
@@ -28,7 +28,7 @@ the License.
   <div class="controls-group well">
     <div class="row-fluid" id="js-showKeys">
       <div class="controls controls-row">
-        <input name="keys" class="input-xxlarge" type="text" placeholder="Enter a key, or list of keys seperated by a comma.">
+        <input name="keys" class="input-xxlarge" type="text" placeholder="Enter a key, an array of keys. This must be valid JSON.">
       </div>
     </div>
     <div class="row-fluid hide" id="js-showStartEnd">
diff --git a/src/fauxton/app/addons/documents/views.js b/src/fauxton/app/addons/documents/views.js
index a94a90c61..1e7addf9d 100644
--- a/src/fauxton/app/addons/documents/views.js
+++ b/src/fauxton/app/addons/documents/views.js
@@ -1132,42 +1132,15 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, resizeColum
       this.hasReduce = hasReduce;
       this.render();
     },
-    getKeys: function(val){
-      var keys = val.value.replace(/\s/g,"");
-      
-      var regKeys = keys.match(/(\[.*?\])/g); 
-      if (regKeys) {
-        keys = regKeys;
-      } else {
-        keys = keys.split(',');
-      }
-
-      keys = _.map(keys, function (key) { return JSON.parse(key); });
-
-      if (_.isArray(keys)){
-        return {
-          name: "keys",
-          value: JSON.stringify(keys)
-        };
-      } else if (keys.length === 1) {
-        return {
-          name: "key",
-          value: keys[0]
-        };
-      }
+    validateKeys:  function(val){
+      return JSON.parse(val);
     },
     queryParams: function () {
-      var $form = this.$(".js-view-query-update"),
-          getKeys = this.getKeys;
+      var $form = this.$(".js-view-query-update");
 
       var params = _.reduce($form.serializeArray(), function(params, param) {
         if (!param.value) { return params; }
         if (param.name === "limit" && param.value === 'None') { return params; }
-        
-        if (param.name === "keys"){
-          param = getKeys(param);
-        }
-
         params.push(param);
         return params;
       }, []);
@@ -1249,17 +1222,6 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, resizeColum
           }
           this.updateFiltersFor(key, $ele);
           break;
-          case "keys":
-            val = JSON.parse(val);
-            var processVal = val;
-            if (_.isArray(val)) {
-              processVal = _.map(val, function (arr) {
-                return JSON.stringify(arr);
-              }).join(', ');
-            }
-
-            $form.find("input[name='keys']").val(processVal);
-            break;
           default:
             $form.find("input[name='"+key+"']").val(val);
           break;