fix bug in initFromSettingsJSON when no facets are defined

thegass · Jan 14, 2016 · 5ac5a29 · 5ac5a29
1 parent 87e9483
commit 5ac5a29
Show file tree

Hide file tree

Showing 6 changed files with 87 additions and 85 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "Backbone.Facetr",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "main": "dist/backbone.facetr.js",
   "ignore": [
     "**/.*",

diff --git a/dist/backbone.facetr.js b/dist/backbone.facetr.js
@@ -1,4 +1,4 @@
-// backbone.facetr 0.4.1 
+// backbone.facetr 0.4.2 
 // Copyright (c)2012 Arillo GmbH 
 // Author: Francesco Macri 
 // Distributed under MIT license 
@@ -30,7 +30,7 @@
         return _getCollection(collection);
     };
 
-    Backbone.Facetr.VERSION = '0.4.1';
+    Backbone.Facetr.VERSION = '0.4.2';
 
     // facet collections cache
     var _collections = {};
@@ -1180,54 +1180,55 @@
         };
 
         this.initFromSettingsJSON = function(json) {
-            var facetCollection, facetr, facets, sort, filter, facetData, attr, 
+            var facetCollection, facetr, facets, sort, facetData, attr, 
             eop, iop, fsort, cust, values, facet, i, j, k, len, len2;
 
             facetr = Backbone.Facetr;
             facetCollection = facetr(collection);
             facets = json.facets;
             sort = json.sort;
-            filter = json.search;
-
-            for(i = 0, len = facets.length; i < len; i += 1) {
-                facetData = facets[i];
-                attr = facetData.attr;
-                eop = facetData.eop;
-                iop = facetData.iop;
-                fsort = facetData.sort;
-                cust = facetData.cust;
-                values = facetData.vals;
-
-                facet = facetCollection.facet(attr, eop);
-
-                switch(fsort.by){
-                    case 'count' : {
-                        facet.sortByCount();
-                    } break;
-                    case 'activeCount' : {
-                        facet.sortByActiveCount();
-                    } break;
-                    default:{
-                        facet.sortByValue();
-                    }
-                }
-
-                facet[fsort.direction]();
-
-                if(cust){
-                    for(k in cust){
-                        if(cust.hasOwnProperty(k)){
-                            facet.customData(k, cust[k]);
-                        }
-                    }
-                }
 
-                for(j = 0, len2 = values.length; j < len2; j += 1) {
-                    facet.value(values[j], iop);
-                }
+            if(facets != null) {
+              for(i = 0, len = facets.length; i < len; i += 1) {
+                  facetData = facets[i];
+                  attr = facetData.attr;
+                  eop = facetData.eop;
+                  iop = facetData.iop;
+                  fsort = facetData.sort;
+                  cust = facetData.cust;
+                  values = facetData.vals;
+
+                  facet = facetCollection.facet(attr, eop);
+
+                  switch(fsort.by){
+                      case 'count' : {
+                          facet.sortByCount();
+                      } break;
+                      case 'activeCount' : {
+                          facet.sortByActiveCount();
+                      } break;
+                      default:{
+                          facet.sortByValue();
+                      }
+                  }
+
+                  facet[fsort.direction]();
+
+                  if(cust){
+                      for(k in cust){
+                          if(cust.hasOwnProperty(k)){
+                              facet.customData(k, cust[k]);
+                          }
+                      }
+                  }
+
+                  for(j = 0, len2 = values.length; j < len2; j += 1) {
+                      facet.value(values[j], iop);
+                  }
+              }
             }
 
-            if(sort) {
+            if(sort != null) {
                 var sattr = sort.by,
                     sdir  = sort.dir;
 

diff --git a/dist/backbone.facetr.min.js b/dist/backbone.facetr.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "backbone.facetr",
   "description": "A library to perform faceted search on Backbone collections",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "homepage": "https://github.com/arillo/Backbone.Facetr",
   "license": "MIT",
   "keywords": [

diff --git a/src/facetr.facetcollection.js b/src/facetr.facetcollection.js
@@ -450,54 +450,55 @@ var FacetCollection = function(collection) {
     };
 
     this.initFromSettingsJSON = function(json) {
-        var facetCollection, facetr, facets, sort, filter, facetData, attr, 
+        var facetCollection, facetr, facets, sort, facetData, attr, 
         eop, iop, fsort, cust, values, facet, i, j, k, len, len2;
 
         facetr = Backbone.Facetr;
         facetCollection = facetr(collection);
         facets = json.facets;
         sort = json.sort;
-        filter = json.search;
-
-        for(i = 0, len = facets.length; i < len; i += 1) {
-            facetData = facets[i];
-            attr = facetData.attr;
-            eop = facetData.eop;
-            iop = facetData.iop;
-            fsort = facetData.sort;
-            cust = facetData.cust;
-            values = facetData.vals;
-
-            facet = facetCollection.facet(attr, eop);
-
-            switch(fsort.by){
-                case 'count' : {
-                    facet.sortByCount();
-                } break;
-                case 'activeCount' : {
-                    facet.sortByActiveCount();
-                } break;
-                default:{
-                    facet.sortByValue();
-                }
-            }
-
-            facet[fsort.direction]();
-
-            if(cust){
-                for(k in cust){
-                    if(cust.hasOwnProperty(k)){
-                        facet.customData(k, cust[k]);
-                    }
-                }
-            }
 
-            for(j = 0, len2 = values.length; j < len2; j += 1) {
-                facet.value(values[j], iop);
-            }
+        if(facets != null) {
+          for(i = 0, len = facets.length; i < len; i += 1) {
+              facetData = facets[i];
+              attr = facetData.attr;
+              eop = facetData.eop;
+              iop = facetData.iop;
+              fsort = facetData.sort;
+              cust = facetData.cust;
+              values = facetData.vals;
+
+              facet = facetCollection.facet(attr, eop);
+
+              switch(fsort.by){
+                  case 'count' : {
+                      facet.sortByCount();
+                  } break;
+                  case 'activeCount' : {
+                      facet.sortByActiveCount();
+                  } break;
+                  default:{
+                      facet.sortByValue();
+                  }
+              }
+
+              facet[fsort.direction]();
+
+              if(cust){
+                  for(k in cust){
+                      if(cust.hasOwnProperty(k)){
+                          facet.customData(k, cust[k]);
+                      }
+                  }
+              }
+
+              for(j = 0, len2 = values.length; j < len2; j += 1) {
+                  facet.value(values[j], iop);
+              }
+          }
         }
 
-        if(sort) {
+        if(sort != null) {
             var sattr = sort.by,
                 sdir  = sort.dir;
 

diff --git a/src/facetr.js b/src/facetr.js
@@ -25,7 +25,7 @@
         return _getCollection(collection);
     };
 
-    Backbone.Facetr.VERSION = '0.4.1';
+    Backbone.Facetr.VERSION = '0.4.2';
 
     //= facetr.helpers.js
     //= facetr.facet.js