Fix issue with missing field values.

rwjblue · Apr 6, 2012 · 9c8c570 · 9c8c570
1 parent 27b8440
commit 9c8c570
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 12 deletions.
diff --git a/pivot.js b/pivot.js
@@ -28,12 +28,9 @@ function reset(){
 };
 
 function config(){
-  var fieldsOutput = getFields(), i = -1, m = fieldsOutput.length;
-  while (++i < m){
-    delete fieldsOutput[i].values;
-  }
 
-  return {  fields: fieldsOutput,
+
+  return {  fields: cloneFields(),
             filters: filters,
             rowLabels: objectKeys(displayFields.rowLabels),
             columnLabels: objectKeys(displayFields.columnLabels),
@@ -374,6 +371,7 @@ function pivotFields(type){
       summarizable:     restrictFields('summarizable'),
       filterable:       restrictFields('filterable'),
       pseudo:           restrictFields('pseudo'),
+      clone:            cloneFields,
       add:              appendField,
       all:              getFields,
       set:              setFields,
@@ -395,6 +393,20 @@ function pivotFields(type){
     }
   };
 
+  function cloneFields(){
+    var fieldsOutput = [];
+    for (var field in fields){
+      var newField = {};
+      for (var key in fields[field]){
+        if (fields[field].hasOwnProperty(key) && key !== 'values')
+          newField[key] = fields[field][key];
+      }
+      fieldsOutput.push(newField);
+    }
+
+    return fieldsOutput;
+  }
+
   function getFields(){
     var retFields = [];
     for (var key in fields) {

diff --git a/pivot.min.js b/pivot.min.js
diff --git a/spec/pivotjs_spec.js b/spec/pivotjs_spec.js
@@ -40,7 +40,7 @@ describe('pivot', function () {
           initialColumnLabels = pivot.utils().objectKeys(pivot.display().columnLabels().get),
           initialSummaries = pivot.utils().objectKeys(pivot.display().summaries().get),
           initialFilters = pivot.filters().all(),
-          initialFields  = pivot.fields().all();
+          initialFields  = pivot.fields().clone();
 
       expect(pivot.config()).toEqual({  fields: initialFields,
                                         filters: initialFilters,

diff --git a/src/fields.js b/src/fields.js
@@ -5,6 +5,7 @@ function pivotFields(type){
       summarizable:     restrictFields('summarizable'),
       filterable:       restrictFields('filterable'),
       pseudo:           restrictFields('pseudo'),
+      clone:            cloneFields,
       add:              appendField,
       all:              getFields,
       set:              setFields,
@@ -26,6 +27,20 @@ function pivotFields(type){
     }
   };
 
+  function cloneFields(){
+    var fieldsOutput = [];
+    for (var field in fields){
+      var newField = {};
+      for (var key in fields[field]){
+        if (fields[field].hasOwnProperty(key) && key !== 'values')
+          newField[key] = fields[field][key];
+      }
+      fieldsOutput.push(newField);
+    }
+
+    return fieldsOutput;
+  }
+
   function getFields(){
     var retFields = [];
     for (var key in fields) {

diff --git a/src/init.js b/src/init.js
@@ -27,12 +27,9 @@ function reset(){
 };
 
 function config(){
-  var fieldsOutput = getFields(), i = -1, m = fieldsOutput.length;
-  while (++i < m){
-    delete fieldsOutput[i].values;
-  }
 
-  return {  fields: fieldsOutput,
+
+  return {  fields: cloneFields(),
             filters: filters,
             rowLabels: objectKeys(displayFields.rowLabels),
             columnLabels: objectKeys(displayFields.columnLabels),