From 01d59a8b6bb33083ef2383372b0867545ae0a87a Mon Sep 17 00:00:00 2001 From: Frederick Ros Date: Thu, 11 Oct 2012 16:24:47 +0200 Subject: [PATCH] Moved to backbone 0.9.2 and underscoe 1.4.2 --- _includes/recline-deps.html | 4 +- dist/recline.dataset.js | 28 +- dist/recline.js | 67 +- docs/src/backend.ckan.html | 7 +- docs/src/backend.couchdb.html | 8 +- docs/src/backend.csv.html | 4 +- docs/src/backend.dataproxy.html | 2 +- docs/src/backend.elasticsearch.html | 8 +- docs/src/backend.gdocs.html | 2 +- docs/src/backend.memory.html | 37 +- docs/src/data.transform.html | 2 +- docs/src/docco.css | 8 +- docs/src/ecma-fixes.html | 66 ++ docs/src/model.html | 64 +- docs/src/view.graph.html | 10 +- docs/src/view.grid.html | 2 +- docs/src/view.map.html | 136 ++- docs/src/view.multiview.html | 5 +- docs/src/view.slickgrid.html | 2 +- docs/src/view.timeline.html | 2 +- docs/src/view.transform.html | 2 +- docs/src/widget.facetviewer.html | 40 +- docs/src/widget.fields.html | 2 +- docs/src/widget.filtereditor.html | 5 +- docs/src/widget.pager.html | 2 +- docs/src/widget.queryeditor.html | 2 +- test/built.html | 4 +- test/index.html | 4 +- vendor/backbone/0.5.1/backbone.js | 1149 -------------------- vendor/backbone/0.9.2/backbone-min.js | 38 + vendor/backbone/0.9.2/backbone.js | 1431 +++++++++++++++++++++++++ vendor/underscore/1.1.6/underscore.js | 807 -------------- vendor/underscore/1.4.2/underscore.js | 1200 +++++++++++++++++++++ 33 files changed, 3006 insertions(+), 2144 deletions(-) create mode 100644 docs/src/ecma-fixes.html delete mode 100644 vendor/backbone/0.5.1/backbone.js create mode 100644 vendor/backbone/0.9.2/backbone-min.js create mode 100644 vendor/backbone/0.9.2/backbone.js delete mode 100755 vendor/underscore/1.1.6/underscore.js create mode 100644 vendor/underscore/1.4.2/underscore.js diff --git a/_includes/recline-deps.html b/_includes/recline-deps.html index 2d0784c0..5b114eb7 100644 --- a/_includes/recline-deps.html +++ b/_includes/recline-deps.html @@ -21,8 +21,8 @@ - - + + diff --git a/dist/recline.dataset.js b/dist/recline.dataset.js index 86359d90..0ac5b397 100644 --- a/dist/recline.dataset.js +++ b/dist/recline.dataset.js @@ -470,16 +470,15 @@ my.Query = Backbone.Model.extend({ } } }, - // ### addFilter + // ### addFilter(filter) // - // Add a new filter (appended to the list of filters) + // Add a new filter specified by the filter hash and append to the list of filters // // @param filter an object specifying the filter - see _filterTemplates for examples. If only type is provided will generate a filter by cloning _filterTemplates addFilter: function(filter) { // crude deep copy var ourfilter = JSON.parse(JSON.stringify(filter)); - // not full specified so use template and over-write - // 3 as for 'type', 'field' and 'fieldType' + // not fully specified so use template and over-write if (_.keys(filter).length <= 3) { ourfilter = _.extend(this._filterTemplates[filter.type], ourfilter); } @@ -595,7 +594,7 @@ this.recline.Backend.Memory = this.recline.Backend.Memory || {}; } else { if (data) { this.fields = _.map(data[0], function(value, key) { - return {id: key}; + return {id: key, type: 'string'}; }); } } @@ -670,10 +669,20 @@ this.recline.Backend.Memory = this.recline.Backend.Memory || {}; geo_distance : geo_distance }; var dataParsers = { - number : function (e) { return parseFloat(e, 10); }, + integer: function (e) { return parseFloat(e, 10); }, + 'float': function (e) { return parseFloat(e, 10); }, string : function (e) { return e.toString() }, - date : function (e) { return new Date(e).valueOf() } + date : function (e) { return new Date(e).valueOf() }, + datetime : function (e) { return new Date(e).valueOf() } }; + var keyedFields = {}; + _.each(self.fields, function(field) { + keyedFields[field.id] = field; + }); + function getDataParser(filter) { + var fieldType = keyedFields[filter.field].type || 'string'; + return dataParsers[fieldType]; + } // filter records return _.filter(results, function (record) { @@ -686,9 +695,8 @@ this.recline.Backend.Memory = this.recline.Backend.Memory || {}; }); // filters definitions - function term(record, filter) { - var parse = dataParsers[filter.fieldType]; + var parse = getDataParser(filter); var value = parse(record[filter.field]); var term = parse(filter.term); @@ -696,7 +704,7 @@ this.recline.Backend.Memory = this.recline.Backend.Memory || {}; } function range(record, filter) { - var parse = dataParsers[filter.fieldType]; + var parse = getDataParser(filter); var value = parse(record[filter.field]); var start = parse(filter.start); var stop = parse(filter.stop); diff --git a/dist/recline.js b/dist/recline.js index a0bbbd77..b9949ece 100644 --- a/dist/recline.js +++ b/dist/recline.js @@ -917,7 +917,7 @@ this.recline.Backend.Memory = this.recline.Backend.Memory || {}; } else { if (data) { this.fields = _.map(data[0], function(value, key) { - return {id: key}; + return {id: key, type: 'string'}; }); } } @@ -992,10 +992,20 @@ this.recline.Backend.Memory = this.recline.Backend.Memory || {}; geo_distance : geo_distance }; var dataParsers = { - number : function (e) { return parseFloat(e, 10); }, + integer: function (e) { return parseFloat(e, 10); }, + 'float': function (e) { return parseFloat(e, 10); }, string : function (e) { return e.toString() }, - date : function (e) { return new Date(e).valueOf() } + date : function (e) { return new Date(e).valueOf() }, + datetime : function (e) { return new Date(e).valueOf() } }; + var keyedFields = {}; + _.each(self.fields, function(field) { + keyedFields[field.id] = field; + }); + function getDataParser(filter) { + var fieldType = keyedFields[filter.field].type || 'string'; + return dataParsers[fieldType]; + } // filter records return _.filter(results, function (record) { @@ -1008,9 +1018,8 @@ this.recline.Backend.Memory = this.recline.Backend.Memory || {}; }); // filters definitions - function term(record, filter) { - var parse = dataParsers[filter.fieldType]; + var parse = getDataParser(filter); var value = parse(record[filter.field]); var term = parse(filter.term); @@ -1018,7 +1027,7 @@ this.recline.Backend.Memory = this.recline.Backend.Memory || {}; } function range(record, filter) { - var parse = dataParsers[filter.fieldType]; + var parse = getDataParser(filter); var value = parse(record[filter.field]); var start = parse(filter.start); var stop = parse(filter.stop); @@ -1718,16 +1727,15 @@ my.Query = Backbone.Model.extend({ } } }, - // ### addFilter + // ### addFilter(filter) // - // Add a new filter (appended to the list of filters) + // Add a new filter specified by the filter hash and append to the list of filters // // @param filter an object specifying the filter - see _filterTemplates for examples. If only type is provided will generate a filter by cloning _filterTemplates addFilter: function(filter) { // crude deep copy var ourfilter = JSON.parse(JSON.stringify(filter)); - // not full specified so use template and over-write - // 3 as for 'type', 'field' and 'fieldType' + // not fully specified so use template and over-write if (_.keys(filter).length <= 3) { ourfilter = _.extend(this._filterTemplates[filter.type], ourfilter); } @@ -4301,20 +4309,27 @@ this.recline.View = this.recline.View || {}; (function($, my) { +// ## FacetViewer +// +// Widget for displaying facets +// +// Usage: +// +// var viewer = new FacetViewer({ +// model: dataset +// }); my.FacetViewer = Backbone.View.extend({ - className: 'recline-facet-viewer well', + className: 'recline-facet-viewer', template: ' \ - × \ -
\ -
\ -

Facets

\ -
\ +
\ {{#facets}} \ -
\ - {{id}} {{label}} \ -
    \ +
    \ +

    \ + {{id}} \ +

    \ +
      \ {{#terms}} \ -
    • {{term}} ({{count}})
      • \ +
    • {{term}} ({{count}})
      • \ {{/terms}} \ {{#entries}} \
    • {{term}} ({{count}})
      • \ @@ -4326,7 +4341,6 @@ my.FacetViewer = Backbone.View.extend({ ', events: { - 'click .js-hide': 'onHide', 'click .js-facet-filter': 'onFacetFilter' }, initialize: function(model) { @@ -4338,10 +4352,9 @@ my.FacetViewer = Backbone.View.extend({ }, render: function() { var tmplData = { - facets: this.model.facets.toJSON(), fields: this.model.fields.toJSON() }; - tmplData.facets = _.map(tmplData.facets, function(facet) { + tmplData.facets = _.map(this.model.facets.toJSON(), function(facet) { if (facet._type === 'date_histogram') { facet.entries = _.map(facet.entries, function(entry) { entry.term = new Date(entry.time).toDateString(); @@ -4364,10 +4377,13 @@ my.FacetViewer = Backbone.View.extend({ this.el.hide(); }, onFacetFilter: function(e) { + e.preventDefault(); var $target= $(e.target); var fieldId = $target.closest('.facet-summary').attr('data-facet'); var value = $target.attr('data-value'); - this.model.queryState.addTermFilter(fieldId, value); + this.model.queryState.addFilter({type: 'term', field: fieldId, term: value}); + // have to trigger explicitly for some reason + this.model.query(); } }); @@ -4613,8 +4629,7 @@ my.FilterEditor = Backbone.View.extend({ $target.hide(); var filterType = $target.find('select.filterType').val(); var field = $target.find('select.fields').val(); - var fieldType = this.model.fields.find(function (e) { return e.get('id') === field }).get('type'); - this.model.queryState.addFilter({type: filterType, field: field, fieldType: fieldType}); + this.model.queryState.addFilter({type: filterType, field: field}); // trigger render explicitly as queryState change will not be triggered (as blank value for filter) this.render(); }, diff --git a/docs/src/backend.ckan.html b/docs/src/backend.ckan.html index 0727be5b..373c3422 100644 --- a/docs/src/backend.ckan.html +++ b/docs/src/backend.ckan.html @@ -1,4 +1,4 @@ - backend.ckan.js

      backend.ckan.js 

      this.recline = this.recline || {};
+      backend.ckan.js           
           
                            
                      
                              
                     backend.ckan.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      this.recline = this.recline || {};
 this.recline.Backend = this.recline.Backend || {};
 this.recline.Backend.Ckan = this.recline.Backend.Ckan || {};
 
@@ -78,8 +78,11 @@
 
   var CKAN_TYPES_MAP = {
     'int4': 'integer',
+    'int8': 'integer',
     'float8': 'float',
-    'text': 'string'
+    'text': 'string',
+    'json': 'object',
+    'timestamp': 'date'
   };
 
 }(jQuery, this.recline.Backend.Ckan));
diff --git a/docs/src/backend.couchdb.html b/docs/src/backend.couchdb.html
index f126f2d1..17de2e69 100644
--- a/docs/src/backend.couchdb.html
+++ b/docs/src/backend.couchdb.html
@@ -1,4 +1,4 @@
-      backend.couchdb.js           
           
                            
                      
                              
                     backend.couchdb.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      this.recline = this.recline || {};
+      backend.couchdb.js           
           
                            
                      
                              
                     backend.couchdb.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      this.recline = this.recline || {};
 this.recline.Backend = this.recline.Backend || {};
 this.recline.Backend.CouchDB = this.recline.Backend.CouchDB || {};
 
@@ -79,7 +79,7 @@ http://wiki.apache.org/couchdb/HTTPDocumentAPI#POST
                   Delete a record from the CouchDB backend.
      
 
 
      @param {Object} id id of object to delete
-@return deferred supporting promise API
                   
      		                            
          this.delete = function(_id) {
+@return deferred supporting promise API
                   
      		                            
          this.remove = function(_id) {
       url = self.endpoint;
       url += '/' + _id;
       return self._makeRequest({
@@ -406,7 +406,7 @@ if (!matches) return false;
                   
      		             
   var cdb      = new my.CouchDBWrapper(db_url, view_url);
 
   if (view_url.search('_all_docs') !== -1) 
-    return cdb.delete(_id);
+    return cdb.remove(_id);
   else {
     _id = model.get('_id').split('__')[0];
     var jqxhr = cdb.get(_id);
@@ -415,7 +415,7 @@ if (!matches) return false;
                         		             
       if (dataset.record_delete)
         old_doc = dataset.record_delete(del_doc, old_doc);
       if (_.isNull(del_doc))
-        dfd.resolve(cdb.delete(_id)); // XXX is this the right thing to do?
+        dfd.resolve(cdb.remove(_id)); // XXX is this the right thing to do?
       else {                        
                                     
                                  
                                      
                     
      couchdb uses _id to identify documents, Backbone models use id.
 we should remove it before sending it to the server.
                         		                            
              old_doc['_id'] = _id;
         delete old_doc['id'];
diff --git a/docs/src/backend.csv.html b/docs/src/backend.csv.html
index 33c222f2..4de7225a 100644
--- a/docs/src/backend.csv.html
+++ b/docs/src/backend.csv.html
@@ -1,4 +1,4 @@
-      backend.csv.js           
           
                            
                      
                              
                     backend.csv.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      this.recline = this.recline || {};
+      backend.csv.js           
           
                            
                      
                              
                     backend.csv.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      this.recline = this.recline || {};
 this.recline.Backend = this.recline.Backend || {};
 this.recline.Backend.CSV = this.recline.Backend.CSV || {};
 
@@ -97,7 +97,7 @@ http://www.uselesscode.org/javascript/csv/
                   
      		             for (i = 0; i < s.length; i += 1) {
       cur = s.charAt(i);                        
                                     
                                  
                                      
                     
      If we are at a EOF or EOR
                         		                            
            if (inQuote === false && (cur === delimiter || cur === "\n")) {
-	field = processField(field);
                         		           
                                     
                                  
                                      
                     
      Add the current field to the current row
                         		                            
              row.push(field);
                         		           
                                     
                                  
                                      
                     
      If this is EOR append row to output and flush row
                         		                            
              if (cur === "\n") {
+  field = processField(field);
                         		           
                                     
                                  
                                      
                     
      Add the current field to the current row
                         		                            
              row.push(field);
                         		           
                                     
                                  
                                      
                     
      If this is EOR append row to output and flush row
                         		                            
              if (cur === "\n") {
           out.push(row);
           row = [];
         }
                         		           
                                     
                                  
                                      
                     
      Flush the field buffer
                         		                            
              field = '';
diff --git a/docs/src/backend.dataproxy.html b/docs/src/backend.dataproxy.html
index 80c1bc89..cc30890c 100644
--- a/docs/src/backend.dataproxy.html
+++ b/docs/src/backend.dataproxy.html
@@ -1,4 +1,4 @@
-      backend.dataproxy.js           
           
                            
                      
                              
                     backend.dataproxy.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      this.recline = this.recline || {};
+      backend.dataproxy.js           
           
                            
                      
                              
                     backend.dataproxy.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      this.recline = this.recline || {};
 this.recline.Backend = this.recline.Backend || {};
 this.recline.Backend.DataProxy = this.recline.Backend.DataProxy || {};
 
diff --git a/docs/src/backend.elasticsearch.html b/docs/src/backend.elasticsearch.html
index e8f2cedf..5927a78d 100644
--- a/docs/src/backend.elasticsearch.html
+++ b/docs/src/backend.elasticsearch.html
@@ -1,4 +1,4 @@
-      backend.elasticsearch.js           
           
                            
                      
                              
                     backend.elasticsearch.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      this.recline = this.recline || {};
+      backend.elasticsearch.js           
           
                            
                      
                              
                     backend.elasticsearch.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      this.recline = this.recline || {};
 this.recline.Backend = this.recline.Backend || {};
 this.recline.Backend.ElasticSearch = this.recline.Backend.ElasticSearch || {};
 
@@ -66,7 +66,7 @@ on http://localhost:9200 with index twitter and type tweet it would be:
      
 
      Delete a record from the ElasticSearch backend.
      
 
 
      @param {Object} id id of object to delete
-@return deferred supporting promise API
                   
      		                            
          this.delete = function(id) {
+@return deferred supporting promise API
                   
      		                            
          this.remove = function(id) {
       url = this.endpoint;
       url += '/' + id;
       return makeRequest({
@@ -185,7 +185,7 @@ via the url attribute.
                   
      		             
     else if (changes.updates.length >0) {
       return es.upsert(changes.updates[0]);
     } else if (changes.deletes.length > 0) {
-      return es.delete(changes.deletes[0].id);
+      return es.remove(changes.deletes[0].id);
     }
   };                        
                                     
                                  
                                      
                     
      query
                         		                            
        my.query = function(queryObj, dataset) {
     var dfd = $.Deferred();
@@ -193,7 +193,7 @@ via the url attribute.
                   
      		             
     var jqxhr = es.query(queryObj);
     jqxhr.done(function(results) {
       var out = {
-        total: results.hits.total,
+        total: results.hits.total
       };
       out.hits = _.map(results.hits.hits, function(hit) {
         if (!('id' in hit._source) && hit._id) {
diff --git a/docs/src/backend.gdocs.html b/docs/src/backend.gdocs.html
index e05f0b2f..25c6a7c0 100644
--- a/docs/src/backend.gdocs.html
+++ b/docs/src/backend.gdocs.html
@@ -1,4 +1,4 @@
-      backend.gdocs.js           
           
                            
                      
                              
                     backend.gdocs.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      this.recline = this.recline || {};
+      backend.gdocs.js           
           
                            
                      
                              
                     backend.gdocs.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      this.recline = this.recline || {};
 this.recline.Backend = this.recline.Backend || {};
 this.recline.Backend.GDocs = this.recline.Backend.GDocs || {};
 
diff --git a/docs/src/backend.memory.html b/docs/src/backend.memory.html
index 248eca99..6ab3e14f 100644
--- a/docs/src/backend.memory.html
+++ b/docs/src/backend.memory.html
@@ -1,4 +1,4 @@
-      backend.memory.js           
           
                            
                      
                              
                     backend.memory.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      this.recline = this.recline || {};
+      backend.memory.js           
           
                            
                      
                              
                     backend.memory.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      this.recline = this.recline || {};
 this.recline.Backend = this.recline.Backend || {};
 this.recline.Backend.Memory = this.recline.Backend.Memory || {};
 
@@ -21,7 +21,7 @@ from the data.
                   
      		             
     } else {
       if (data) {
         this.fields = _.map(data[0], function(value, key) {
-          return {id: key};
+          return {id: key, type: 'string'};
         });
       }
     }
@@ -34,7 +34,7 @@ from the data.
                         		             
       });
     };
 
-    this.delete = function(doc) {
+    this.remove = function(doc) {
       var newdocs = _.reject(self.data, function(internalDoc) {
         return (doc.id === internalDoc.id);
       });
@@ -47,7 +47,7 @@ from the data.
                         		             
         self.update(record);
       });
       _.each(changes.deletes, function(record) {
-        self.delete(record);
+        self.remove(record);
       });
       dfd.resolve();
       return dfd.promise();
@@ -86,15 +86,25 @@ What's wrong is we sort on the last entry in the sort list if there are
         geo_distance : geo_distance
       };
       var dataParsers = {
-        number : function (e) { return parseFloat(e, 10); },
+        integer: function (e) { return parseFloat(e, 10); },
+        'float': function (e) { return parseFloat(e, 10); },
         string : function (e) { return e.toString() },
-        date   : function (e) { return new Date(e).valueOf() }
-      };                        
                                     
                                  
                                      
                     
      filter records
                         		                            
            return _.filter(results, function (record) {
+        date   : function (e) { return new Date(e).valueOf() },
+        datetime   : function (e) { return new Date(e).valueOf() }
+      };
+      var keyedFields = {};
+      _.each(self.fields, function(field) {
+        keyedFields[field.id] = field;
+      });
+      function getDataParser(filter) {
+        var fieldType = keyedFields[filter.field].type || 'string';
+        return dataParsers[fieldType];
+      }
                         		           
                                     
                                  
                                      
                     
      filter records
                         		                            
            return _.filter(results, function (record) {
         var passes = _.map(filters, function (filter) {
           return filterFunctions[filter.type](record, filter);
         });
                         		           
                                     
                                  
                                      
                     
      return only these records that pass all filters
                         		                            
              return _.all(passes, _.identity);
       });
                         		           
                                     
                                  
                                      
                     
      filters definitions
                         		                            
            function term(record, filter) {
-        var parse = dataParsers[filter.fieldType];
+        var parse = getDataParser(filter);
         var value = parse(record[filter.field]);
         var term  = parse(filter.term);
 
@@ -102,7 +112,7 @@ What's wrong is we sort on the last entry in the sort list if there are
       }
 
       function range(record, filter) {
-        var parse = dataParsers[filter.fieldType];
+        var parse = getDataParser(filter);
         var value = parse(record[filter.field]);
         var start = parse(filter.start);
         var stop  = parse(filter.stop);
@@ -114,16 +124,19 @@ What's wrong is we sort on the last entry in the sort list if there are
     };
                         		           
                                     
                                  
                                      
                     
      we OR across fields but AND across terms in query string
                         		                            
          this._applyFreeTextQuery = function(results, queryObj) {
       if (queryObj.q) {
         var terms = queryObj.q.split(' ');
+        var patterns=_.map(terms, function(term) {
+          return new RegExp(term.toLowerCase());;
+          });
         results = _.filter(results, function(rawdoc) {
           var matches = true;
-          _.each(terms, function(term) {
+          _.each(patterns, function(pattern) {
             var foundmatch = false;
             _.each(self.fields, function(field) {
               var value = rawdoc[field.id];
-              if (value !== null) { 
+              if ((value !== null) && (value !== undefined)) { 
                 value = value.toString();
               } else {
                         		           
                                     
                                  
                                      
                     
      value can be null (apparently in some cases)
                         		                            
                      value = '';
-              }
                         		           
                                     
                                  
                                      
                     
      TODO regexes?
                         		                            
                    foundmatch = foundmatch || (value.toLowerCase() === term.toLowerCase());
                         		           
                                     
                                  
                                      
                     
      TODO: early out (once we are true should break to spare unnecessary testing)
+              }             
      		           
                                     
                                  
                                      
                     
      TODO regexes?
                         		                            
                    foundmatch = foundmatch || (pattern.test(value.toLowerCase()));
                         		           
                                     
                                  
                                      
                     
      TODO: early out (once we are true should break to spare unnecessary testing)
 if (foundmatch) return true;
                         		                            
                  });
             matches = matches && foundmatch;
                         		           
                                     
                                  
                                      
                     
      TODO: early out (once false should break to spare unnecessary testing)
 if (!matches) return false;
                         		                            
                });
diff --git a/docs/src/data.transform.html b/docs/src/data.transform.html
index 62a7fa8e..ec2a4784 100644
--- a/docs/src/data.transform.html
+++ b/docs/src/data.transform.html
@@ -1,4 +1,4 @@
-      data.transform.js           
           
                            
                      
                              
                     data.transform.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      this.recline = this.recline || {};
+      data.transform.js           
           
                            
                      
                              
                     data.transform.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      this.recline = this.recline || {};
 this.recline.Data = this.recline.Data || {};
 
 (function(my) {
                         		           
                                     
                                  
                                      
                     
      adapted from https://github.com/harthur/costco. heather rules
                         		                            
      my.Transform = {};
diff --git a/docs/src/docco.css b/docs/src/docco.css
index 5aa0a8d7..04cc7ecb 100644
--- a/docs/src/docco.css
+++ b/docs/src/docco.css
@@ -21,6 +21,12 @@ h1, h2, h3, h4, h5, h6 {
   h1 {
     margin-top: 40px;
   }
+hr {
+    border: 0 none;
+    border-top: 1px solid #e5e5ee;
+    height: 1px;
+    margin: 20px 0;
+}
 #container {
   position: relative;
 }
@@ -115,7 +121,7 @@ table td {
   }
     pre, tt, code {
       font-size: 12px; line-height: 18px;
-      font-family: Monaco, Consolas, "Lucida Console", monospace;
+      font-family: Menlo, Monaco, Consolas, "Lucida Console", monospace;
       margin: 0; padding: 0;
     }
 
diff --git a/docs/src/ecma-fixes.html b/docs/src/ecma-fixes.html
new file mode 100644
index 00000000..212ecf5d
--- /dev/null
+++ b/docs/src/ecma-fixes.html
@@ -0,0 +1,66 @@
+      ecma-fixes.js           
           
                            
                      
                              
                     ecma-fixes.js             
                       		                               
                                                         
                                  
                                      
                     
      This file adds in full array method support in browsers that don't support it
+see: http://stackoverflow.com/questions/2790001/fixing-javascript-array-functions-in-internet-explorer-indexof-foreach-etc
                         		                            
                         		           
                                     
                                  
                                      
                     
      Add ECMA262-5 Array methods if not supported natively
                         		                            
      if (!('indexOf' in Array.prototype)) {
+    Array.prototype.indexOf= function(find, i /*opt*/) {
+        if (i===undefined) i= 0;
+        if (i<0) i+= this.length;
+        if (i<0) i= 0;
+        for (var n= this.length; i<n; i++)
+            if (i in this && this[i]===find)
+                return i;
+        return -1;
+    };
+}
+if (!('lastIndexOf' in Array.prototype)) {
+    Array.prototype.lastIndexOf= function(find, i /*opt*/) {
+        if (i===undefined) i= this.length-1;
+        if (i<0) i+= this.length;
+        if (i>this.length-1) i= this.length-1;
+        for (i++; i-->0;) /* i++ because from-argument is sadly inclusive */
+            if (i in this && this[i]===find)
+                return i;
+        return -1;
+    };
+}
+if (!('forEach' in Array.prototype)) {
+    Array.prototype.forEach= function(action, that /*opt*/) {
+        for (var i= 0, n= this.length; i<n; i++)
+            if (i in this)
+                action.call(that, this[i], i, this);
+    };
+}
+if (!('map' in Array.prototype)) {
+    Array.prototype.map= function(mapper, that /*opt*/) {
+        var other= new Array(this.length);
+        for (var i= 0, n= this.length; i<n; i++)
+            if (i in this)
+                other[i]= mapper.call(that, this[i], i, this);
+        return other;
+    };
+}
+if (!('filter' in Array.prototype)) {
+    Array.prototype.filter= function(filter, that /*opt*/) {
+        var other= [], v;
+        for (var i=0, n= this.length; i<n; i++)
+            if (i in this && filter.call(that, v= this[i], i, this))
+                other.push(v);
+        return other;
+    };
+}
+if (!('every' in Array.prototype)) {
+    Array.prototype.every= function(tester, that /*opt*/) {
+        for (var i= 0, n= this.length; i<n; i++)
+            if (i in this && !tester.call(that, this[i], i, this))
+                return false;
+        return true;
+    };
+}
+if (!('some' in Array.prototype)) {
+    Array.prototype.some= function(tester, that /*opt*/) {
+        for (var i= 0, n= this.length; i<n; i++)
+            if (i in this && tester.call(that, this[i], i, this))
+                return true;
+        return false;
+    };
+}
+
+
                         		           
                                 
         
         
\ No newline at end of file
diff --git a/docs/src/model.html b/docs/src/model.html
index 47cd7aab..5ac6ed8c 100644
--- a/docs/src/model.html
+++ b/docs/src/model.html
@@ -1,4 +1,4 @@
-      model.js           
           
                            
                      
                              
                     model.js             
                       		                               
                                                         
                                  
                                      
                     
      Recline Backbone Models
                         		                            
      this.recline = this.recline || {};
+      model.js           
           
                            
                      
                              
                     model.js             
                       		                               
                                                         
                                  
                                      
                     
      Recline Backbone Models
                         		                            
      this.recline = this.recline || {};
 this.recline.Model = this.recline.Model || {};
 
 (function($, my) {
                         		           
                                     
                                  
                                      
                     
      Dataset
                         		                            
      my.Dataset = Backbone.Model.extend({
@@ -213,17 +213,8 @@ also returned.
                   
      		             
     return record.summary();
   },                        
                                     
                                  
                                      
                     
      _backendFromString(backendString)
      
 
-
      See backend argument to initialize for details
                         		                            
        _backendFromString: function(backendString) {
-    var parts = backendString.split('.');
                         		           
                                     
                                  
                                      
                     
      walk through the specified path xxx.yyy.zzz to get the final object which should be backend class
                         		                            
          var current = window;
-    for(ii=0;ii<parts.length;ii++) {
-      if (!current) {
-        break;
-      }
-      current = current[parts[ii]];
-    }
-    if (current) {
-      return current;
-    }
                         		           
                                     
                                  
                                      
                     
      alternatively we just had a simple string
                         		                            
          var backend = null;
+
      Look up a backend module from a backend string (look in recline.Backend)
                   
      		                            
        _backendFromString: function(backendString) {
+    var backend = null;
     if (recline && recline.Backend) {
       _.each(_.keys(recline.Backend), function(name) {
         if (name.toLowerCase() === backendString.toLowerCase()) {
@@ -233,12 +224,12 @@ also returned.
                   
      		             
     }
     return backend;
   }
-});                        
                                     
                                  
                                      
                     
      A Record
      
+});                   		           
                                     
                                  
                                      
                     
      A Record
      
 
 
      A single record (or row) in the dataset
                         		                            
      my.Record = Backbone.Model.extend({
   constructor: function Record() {
     Backbone.Model.prototype.constructor.apply(this, arguments);
-  },
                         		           
                                     
                                  
                                      
                     
      initialize
      
+  },                   		           
                                     
                                  
                                      
                     
      initialize
      
 
 
      Create a Record
      
 
@@ -247,7 +238,7 @@ Dataset e.g. in query method
      
 
 
      Certain methods require presence of a fields attribute (identical to that on Dataset)
                         		                            
        initialize: function() {
     _.bindAll(this, 'getFieldValue');
-  },
                         		           
                                     
                                  
                                      
                     
      getFieldValue
      
+  },                   		           
                                     
                                  
                                      
                     
      getFieldValue
      
 
 
      For the provided Field get the corresponding rendered computed data value
 for this record.
                         		                            
        getFieldValue: function(field) {
@@ -256,7 +247,7 @@ for this record.
                   
      		             
       val = field.renderer(val, field, this.toJSON());
     }
     return val;
-  },                        
                                     
                                  
                                      
                     
      getFieldValueUnrendered
      
+  },                   		           
                                     
                                  
                                      
                     
      getFieldValueUnrendered
      
 
 
      For the provided Field get the corresponding computed data value
 for this record.
                         		                            
        getFieldValueUnrendered: function(field) {
@@ -265,7 +256,7 @@ for this record.
                   
      		             
       val = field.deriver(val, field, this);
     }
     return val;
-  },                        
                                     
                                  
                                      
                     
      summary
      
+  },                   		           
                                     
                                  
                                      
                     
      summary
      
 
 
      Get a simple html summary of this record in form of key/value list
                         		                            
        summary: function(record) {
     var self = this;
@@ -277,30 +268,30 @@ for this record.
                   
      		             
     });
     html += '</div>';
     return html;
-  },                        
                                     
                                  
                                      
                     
      Override Backbone save, fetch and destroy so they do nothing
+  },             
      		           
                                     
                                  
                                      
                     
      Override Backbone save, fetch and destroy so they do nothing
 Instead, Dataset object that created this Record should take care of
 handling these changes (discovery will occur via event notifications)
 WARNING: these will not persist unless you call save on Dataset
                         		                            
        fetch: function() {},
   save: function() {},
   destroy: function() { this.trigger('destroy', this); }
-});
                         		           
                                     
                                  
                                      
                     
      A Backbone collection of Records
                         		                            
      my.RecordList = Backbone.Collection.extend({
+});
                         		           
                                     
                                  
                                      
                     
      A Backbone collection of Records
                         		                            
      my.RecordList = Backbone.Collection.extend({
   constructor: function RecordList() {
     Backbone.Collection.prototype.constructor.apply(this, arguments);
   },
   model: my.Record
-});
                         		           
                                     
                                  
                                      
                     
      A Field (aka Column) on a Dataset
                         		                            
      my.Field = Backbone.Model.extend({
+});
                         		           
                                     
                                  
                                      
                     
      A Field (aka Column) on a Dataset
                         		                            
      my.Field = Backbone.Model.extend({
   constructor: function Field() {
     Backbone.Model.prototype.constructor.apply(this, arguments);
-  },
                         		           
                                     
                                  
                                      
                     
      defaults - define default values
                         		                            
        defaults: {
+  },
                         		           
                                     
                                  
                                      
                     
      defaults - define default values
                         		                            
        defaults: {
     label: null,
     type: 'string',
     format: null,
     is_derived: false
-  },
                         		           
                                     
                                  
                                      
                     
      initialize
      
+  },                   		           
                                     
                                  
                                      
                     
      initialize
      
 
 
      @param {Object} data: standard Backbone model attributes
      
 
-
      @param {Object} options: renderer and/or deriver functions.
                         		                            
        initialize: function(data, options) {
                         		           
                                     
                                  
                                      
                     
      if a hash not passed in the first argument throw error
                         		                            
          if ('0' in data) {
+
      @param {Object} options: renderer and/or deriver functions.
                   
      		                            
        initialize: function(data, options) {
                         		           
                                     
                                  
                                      
                     
      if a hash not passed in the first argument throw error
                         		                            
          if ('0' in data) {
       throw new Error('Looks like you did not pass a proper hash with id to Field constructor');
     }
     if (this.attributes.label === null) {
@@ -341,7 +332,7 @@ WARNING: these will not persist unless you call save on Dataset
      
         }
       } else if (format == 'plain') {
         return val;
-      } else {
                         		           
                                     
                                  
                                      
                     
      as this is the default and default type is string may get things
+      } else {             
      		           
                                     
                                  
                                      
                     
      as this is the default and default type is string may get things
 here that are not actually strings
                         		                            
              if (val && typeof val === 'string') {
           val = val.replace(/(https?:\/\/[^ ]+)/g, '<a href="$1">$1</a>');
         }
@@ -356,7 +347,7 @@ here that are not actually strings
                   
      		             Backbone.Collection.prototype.constructor.apply(this, arguments);
   },
   model: my.Field
-});                        
                                     
                                  
                                      
                     
      Query
                         		                            
      my.Query = Backbone.Model.extend({
+});
                         		           
                                     
                                  
                                      
                     
      Query
                         		                            
      my.Query = Backbone.Model.extend({
   constructor: function Query() {
     Backbone.Model.prototype.constructor.apply(this, arguments);
   },
@@ -371,7 +362,7 @@ here that are not actually strings
                   
      		             },
   _filterTemplates: {
     term: {
-      type: 'term',                        
                                     
                                  
                                      
                     
      TODO do we need this attribute here?
                         		                            
            field: '',
+      type: 'term',
                         		           
                                     
                                  
                                      
                     
      TODO do we need this attribute here?
                         		                            
            field: '',
       term: ''
     },
     range: {
@@ -388,12 +379,11 @@ here that are not actually strings
                   
      		             lat: 0
       }
     }
-  },                          
                                     
                                  
                                      
                     
      addFilter
      
+  },                     		           
                                     
                                  
                                      
                     
      addFilter(filter)
      
 
-
      Add a new filter (appended to the list of filters)
      
+
      Add a new filter specified by the filter hash and append to the list of filters
      
 
-
      @param filter an object specifying the filter - see _filterTemplates for examples. If only type is provided will generate a filter by cloning _filterTemplates
                         		                            
        addFilter: function(filter) {
                         		           
                                     
                                  
                                      
                     
      crude deep copy
                         		                            
          var ourfilter = JSON.parse(JSON.stringify(filter));
                         		           
                                     
                                  
                                      
                     
      not full specified so use template and over-write
-3 as for 'type', 'field' and 'fieldType'
                         		                            
          if (_.keys(filter).length <= 3) {
+
      @param filter an object specifying the filter - see _filterTemplates for examples. If only type is provided will generate a filter by cloning _filterTemplates
                   
      		                            
        addFilter: function(filter) {
                         		           
                                     
                                  
                                      
                     
      crude deep copy
                         		                            
          var ourfilter = JSON.parse(JSON.stringify(filter));
                         		           
                                     
                                  
                                      
                     
      not fully specified so use template and over-write
                         		                            
          if (_.keys(filter).length <= 3) {
       ourfilter = _.extend(this._filterTemplates[filter.type], ourfilter);
     }
     var filters = this.get('filters');
@@ -401,19 +391,19 @@ here that are not actually strings
                   
      		             this.trigger('change:filters:new-blank');
   },
   updateFilter: function(index, value) {
-  },                        
                                     
                                  
                                      
                     
      removeFilter
      
+  },                   		           
                                     
                                  
                                      
                     
      removeFilter
      
 
 
      Remove a filter from filters at index filterIndex
                         		                            
        removeFilter: function(filterIndex) {
     var filters = this.get('filters');
     filters.splice(filterIndex, 1);
     this.set({filters: filters});
     this.trigger('change');
-  },
                         		           
                                     
                                  
                                      
                     
      addFacet
      
+  },                   		           
                                     
                                  
                                      
                     
      addFacet
      
 
 
      Add a Facet to this query
      
 
 
      See http://www.elasticsearch.org/guide/reference/api/search/facets/
                         		                            
        addFacet: function(fieldId) {
-    var facets = this.get('facets');
                         		           
                                     
                                  
                                      
                     
      Assume id and fieldId should be the same (TODO: this need not be true if we want to add two different type of facets on same field)
                         		                            
          if (_.contains(_.keys(facets), fieldId)) {
+    var facets = this.get('facets');
                         		           
                                     
                                  
                                      
                     
      Assume id and fieldId should be the same (TODO: this need not be true if we want to add two different type of facets on same field)
                         		                            
          if (_.contains(_.keys(facets), fieldId)) {
       return;
     }
     facets[fieldId] = {
@@ -433,7 +423,7 @@ here that are not actually strings
                   
      		             this.set({facets: facets}, {silent: true});
     this.trigger('facet:add', this);
   }
-});                        
                                     
                                  
                                      
                     
      A Facet (Result)
                         		                            
      my.Facet = Backbone.Model.extend({
+});
                         		           
                                     
                                  
                                      
                     
      A Facet (Result)
                         		                            
      my.Facet = Backbone.Model.extend({
   constructor: function Facet() {
     Backbone.Model.prototype.constructor.apply(this, arguments);
   },
@@ -446,15 +436,15 @@ here that are not actually strings
                   
      		             terms: []
     };
   }
-});                        
                                     
                                  
                                      
                     
      A Collection/List of Facets
                         		                            
      my.FacetList = Backbone.Collection.extend({
+});
                         		           
                                     
                                  
                                      
                     
      A Collection/List of Facets
                         		                            
      my.FacetList = Backbone.Collection.extend({
   constructor: function FacetList() {
     Backbone.Collection.prototype.constructor.apply(this, arguments);
   },
   model: my.Facet
-});
                         		           
                                     
                                  
                                      
                     
      Object State
      
+});                   		           
                                     
                                  
                                      
                     
      Object State
      
 
 
      Convenience Backbone model for storing (configuration) state of objects like Views.
                         		                            
      my.ObjectState = Backbone.Model.extend({
-});
                         		           
                                     
                                  
                                      
                     
      Backbone.sync
      
+});                   		           
                                     
                                  
                                      
                     
      Backbone.sync
      
 
 
      Override Backbone.sync to hand off to sync function in relevant backend
                         		                            
      Backbone.sync = function(method, model, options) {
   return model.backend.sync(method, model, options);
diff --git a/docs/src/view.graph.html b/docs/src/view.graph.html
index 8fd0d659..96d55abc 100644
--- a/docs/src/view.graph.html
+++ b/docs/src/view.graph.html
@@ -1,4 +1,4 @@
-      view.graph.js           
           
                            
                      
                              
                     view.graph.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      /*jshint multistr:true */
+      view.graph.js           
           
                            
                      
                              
                     view.graph.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      /*jshint multistr:true */
 
 this.recline = this.recline || {};
 this.recline.View = this.recline.View || {};
@@ -197,7 +197,7 @@ generate the element itself (you can then append view.el to the DOM.
      
           horizontal: true,
           shadowSize: 0,
           barWidth: 0.8         
-        },
+        }
       },
       columns: {
         legend: legend,
@@ -218,9 +218,9 @@ generate the element itself (you can then append view.el to the DOM.
      
             horizontal: false,
             shadowSize: 0,
             barWidth: 0.8         
-        },
+        }
       },
-      grid: { hoverable: true, clickable: true },
+      grid: { hoverable: true, clickable: true }
     };
     return optionsPerGraphType[typeId];
   },
@@ -375,7 +375,7 @@ generate the element itself (you can then append view.el to the DOM.
      
 
      Returns itself.
                   
      		                            
        addSeries: function (idx) {
     var data = _.extend({
       seriesIndex: idx,
-      seriesName: String.fromCharCode(idx + 64 + 1),
+      seriesName: String.fromCharCode(idx + 64 + 1)
     }, this.model.toTemplateJSON());
 
     var htmls = Mustache.render(this.templateSeriesEditor, data);
diff --git a/docs/src/view.grid.html b/docs/src/view.grid.html
index 02c7230a..13efa9b7 100644
--- a/docs/src/view.grid.html
+++ b/docs/src/view.grid.html
@@ -1,4 +1,4 @@
-      view.grid.js           
           
                            
                      
                              
                     view.grid.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      /*jshint multistr:true */
+      view.grid.js           
           
                            
                      
                              
                     view.grid.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      /*jshint multistr:true */
 
 this.recline = this.recline || {};
 this.recline.View = this.recline.View || {};
diff --git a/docs/src/view.map.html b/docs/src/view.map.html
index 9dc80dde..d9f49d17 100644
--- a/docs/src/view.map.html
+++ b/docs/src/view.map.html
@@ -1,4 +1,4 @@
-      view.map.js           
           
                            
                      
                              
                     view.map.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      /*jshint multistr:true */
+      view.map.js           
           
                            varbg=newL.TileLayer(mapUrl,{maxZoom:18,attribution:osmAttribution,subdomains:'1234'});this.map.addLayer(bg);
 
-    this.features=newL.GeoJSON();
-    this.map.addLayer(this.features);
+    this.markers=newL.MarkerClusterGroup(this._clusterOptions);
+
+    this.features=newL.GeoJSON(null,{
+        pointToLayer:function(feature,latlng){
+          varmarker=newL.marker(latlng);
+          marker.bindPopup(feature.properties.popupContent);
+          self.markers.addLayer(marker);
+          returnmarker;
+        }
+    });this.map.setView([0,0],2);this.mapReady=true;
-  },      </div> \      <div class="editor-options" > \        <label class="checkbox"> \
-          <input type="checkbox" id="editor-auto-zoom" checked="checked" /> \
+          <input type="checkbox" id="editor-auto-zoom" value="autozoom" checked="checked" /> \          Auto zoom to features</label> \
+        <label class="checkbox"> \
+          <input type="checkbox" id="editor-cluster" value="cluster"/> \
+          Cluster markers</label> \      </div> \      <input type="hidden" class="editor-id" value="map-1" /> \      </div> \    </form> \
-',this.state=newrecline.Model.ObjectState(options.state);this.state.bind('change',this.render);this.render();
-  },}if(this.state.get('autoZoom')){this.el.find('#editor-auto-zoom').attr('checked','checked');
-    }
-    else{
+    }else{this.el.find('#editor-auto-zoom').removeAttr('checked');}
+    if(this.state.get('cluster')){
+      this.el.find('#editor-cluster').attr('checked','checked');
+    }else{
+      this.el.find('#editor-cluster').removeAttr('checked');
+    }returnthis;},_geomReady:function(){returnBoolean(this.state.get('geomField')||(this.state.get('latField')&&this.state.get('lonField')));
-  },
                      
                              
                     view.map.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      /*jshint multistr:true */
 
 this.recline = this.recline || {};
 this.recline.View = this.recline.View || {};
@@ -47,14 +47,22 @@ If not found, the user will need to define the fields via the editor.
      
         geomField: null,
         lonField: null,
         latField: null,
-        autoZoom: true
+        autoZoom: true,
+        cluster: false
       },
       options.state
     );
-    this.state = new recline.Model.ObjectState(stateData);
                         		           
                                     
                                  
                                      
                     
      Listen to changes in the fields
                         		                            
          this.model.fields.bind('change', function() {
+    this.state = new recline.Model.ObjectState(stateData);
+
+    this._clusterOptions = {
+      zoomToBoundsOnClick: true,
                         		           
                                     
                                  
                                      
                     
      disableClusteringAtZoom: 10,
                         		                            
            maxClusterRadius: 80,
+      singleMarkerMode: false,
+      skipDuplicateAddTesting: true,
+      animateAddingMarkers: false
+    };
                         		           
                                     
                                  
                                      
                     
      Listen to changes in the fields
                         		                            
          this.model.fields.bind('change', function() {
       self._setupGeometryField();
       self.render();
-    });
                         		           
                                     
                                  
                                      
                     
      Listen to changes in the records
                         		                            
          this.model.records.bind('add', function(doc){self.redraw('add',doc);});
+    });
                         		           
                                     
                                  
                                      
                     
      Listen to changes in the records
                         		                            
          this.model.records.bind('add', function(doc){self.redraw('add',doc);});
     this.model.records.bind('change', function(doc){
         self.redraw('remove',doc);
         self.redraw('add',doc);
@@ -70,11 +78,14 @@ If not found, the user will need to define the fields via the editor.
      
       self.state.set(self.menu.state.toJSON());
       self.redraw();
     });
+    this.state.bind('change', function() {
+      self.redraw();
+    });
     this.elSidebar = this.menu.el;
-  },
                         		           
                                     
                                  
                                      
                     
      Customization Functions
      
+  },                   		           
                                     
                                  
                                      
                     
      Customization Functions
      
 
 
      The following methods are designed for overriding in order to customize
-behaviour
                         		                            
                         		           
                                     
                                  
                                      
                     
      infobox
      
+behaviour
                         		                            
                         		           
                                     
                                  
                                      
                     
      infobox
      
 
 
      Function to create infoboxes used in popups. The default behaviour is very simple and just lists all attributes.
      
 
@@ -92,7 +103,7 @@ view.infobox = function(record) {
       }
     }
     return html;
-  },                   		           
                                     
                                  
                                      
                     
      END: Customization section
                         		                            
                         		           
                                     
                                  
                                      
                     
      Public: Adds the necessary elements to the page.
      
+  },                   		           
                                     
                                  
                                      
                     
      END: Customization section
                         		                            
                         		           
                                     
                                  
                                      
                     
      Public: Adds the necessary elements to the page.
      
 
 
      Also sets up the editor fields and the map if necessary.
                         		                            
        render: function() {
     var self = this;
@@ -102,7 +113,7 @@ view.infobox = function(record) {
     this.$map = this.el.find('.panel.map');
     this.redraw();
     return this;
-  },
                         		           
                                     
                                  
                                      
                     
      Public: Redraws the features on the map according to the action provided
      
+  },                   		           
                                     
                                  
                                      
                     
      Public: Redraws the features on the map according to the action provided
      
 
 
      Actions can be:
      
 
@@ -113,22 +124,35 @@ view.infobox = function(record) {
 
    • refresh: Clear existing features and add all current records
      • 
                    		                            
        redraw: function(action, doc){
     var self = this;
-    action = action || 'refresh';
                         		           
                                     
                                  
                                      
                     
      try to set things up if not already
                         		                            
          if (!self._geomReady()){
+    action = action || 'refresh';
                         		           
                                     
                                  
                                      
                     
      try to set things up if not already
                         		                            
          if (!self._geomReady()){
       self._setupGeometryField();
     }
     if (!self.mapReady){
       self._setupMap();
     }
 
-    if (this._geomReady() && this.mapReady){
-      if (action == 'reset' || action == 'refresh'){
-        this.features.clearLayers();
+    if (this._geomReady() && this.mapReady){
                         		           
                                     
                                  
                                      
                     
      removing ad re-adding the layer enables faster bulk loading
                         		                            
            this.map.removeLayer(this.features);
+      this.map.removeLayer(this.markers);
+
+      var countBefore = 0;
+      this.features.eachLayer(function(){countBefore++;});
+
+      if (action == 'refresh' || action == 'reset') {
+        this.features.clearLayers();
                         		           
                                     
                                  
                                      
                     
      recreate cluster group because of issues with clearLayer
                         		                            
              this.map.removeLayer(this.markers);
+        this.markers = new L.MarkerClusterGroup(this._clusterOptions);
         this._add(this.model.records.models);
       } else if (action == 'add' && doc){
         this._add(doc);
       } else if (action == 'remove' && doc){
         this._remove(doc);
+      }
                         		           
                                     
                                  
                                      
                     
      enable clustering if there is a large number of markers
                         		                            
            var countAfter = 0;
+      this.features.eachLayer(function(){countAfter++;});
+      var sizeIncreased = countAfter - countBefore > 0;
+      if (!this.state.get('cluster') && countAfter > 64 && sizeIncreased) {
+        this.state.set({cluster: true});
+        return;
       }
+
       if (this.state.get('autoZoom')){
         if (this.visible){
           this._zoomToFeatures();
@@ -136,10 +160,15 @@ view.infobox = function(record) {
           this._zoomPending = true;
         }
       }
+      if (this.state.get('cluster')) {
+        this.map.addLayer(this.markers);
+      } else {
+        this.map.addLayer(this.features);
+      }
     }
   },
 
-  show: function() {
                         		           
                                     
                                  
                                      
                     
      If the div was hidden, Leaflet needs to recalculate some sizes
+  show: function() {             
      		           
                                     
                                  
                                      
                     
      If the div was hidden, Leaflet needs to recalculate some sizes
 to display properly
                         		                            
          if (this.map){
       this.map.invalidateSize();
       if (this._zoomPending && this.state.get('autoZoom')) {
@@ -156,7 +185,7 @@ to display properly
                   
      		             
 
   _geomReady: function() {
     return Boolean(this.state.get('geomField') || (this.state.get('latField') && this.state.get('lonField')));
-  },                        
                                     
                                  
                                      
                     
      Private: Add one or n features to the map
      
+  },                   		           
                                     
                                  
                                      
                     
      Private: Add one or n features to the map
      
 
 
      For each record passed, a GeoJSON geometry will be extracted and added
 to the features layer. If an exception is thrown, the process will be
@@ -172,19 +201,15 @@ stopped and an error notification shown.
      
     _.every(docs, function(doc){
       count += 1;
       var feature = self._getGeometryFromRecord(doc);
-      if (typeof feature === 'undefined' || feature === null){                   		           
                                     
                                  
                                      
                     
      Empty field
                         		                            
              return true;
+      if (typeof feature === 'undefined' || feature === null){
                         		           
                                     
                                  
                                      
                     
      Empty field
                         		                            
              return true;
       } else if (feature instanceof Object){
         feature.properties = {
-          popupContent: self.infobox(doc),
                         		           
                                     
                                  
                                      
                     
      Add a reference to the model id, which will allow us to
+          popupContent: self.infobox(doc),             
      		           
                                     
                                  
                                      
                     
      Add a reference to the model id, which will allow us to
 link this Leaflet layer to a Recline doc
                         		                            
                cid: doc.cid
         };
 
         try {
           self.features.addData(feature);
-
-          if (feature.properties && feature.properties.popupContent) {
-            self.features.bindPopup(feature.properties.popupContent);
-          }
         } catch (except) {
           wrongSoFar += 1;
           var msg = 'Wrong geometry value';
@@ -201,7 +226,7 @@ link this Leaflet layer to a Recline doc
                   
      		             }
       return true;
     });
-  },                        
                                     
                                  
                                      
                     
      Private: Remove one or n features to the map
                         		                            
        _remove: function(docs){
+  },
                         		           
                                     
                                  
                                      
                     
      Private: Remove one or n features from the map
                         		                            
        _remove: function(docs){
 
     var self = this;
 
@@ -215,10 +240,10 @@ link this Leaflet layer to a Recline doc
                   
      		             }
     });
 
-  },                        
                                     
                                  
                                      
                     
      Private: Return a GeoJSON geomtry extracted from the record fields
                         		                            
        _getGeometryFromRecord: function(doc){
+  },
                         		           
                                     
                                  
                                      
                     
      Private: Return a GeoJSON geomtry extracted from the record fields
                         		                            
        _getGeometryFromRecord: function(doc){
     if (this.state.get('geomField')){
       var value = doc.get(this.state.get('geomField'));
-      if (typeof(value) === 'string'){
                         		           
                                     
                                  
                                      
                     
      We may have a GeoJSON string representation
                         		                            
              try {
+      if (typeof(value) === 'string'){
                         		           
                                     
                                  
                                      
                     
      We may have a GeoJSON string representation
                         		                            
              try {
           value = $.parseJSON(value);
         } catch(e) {}
       }
@@ -236,16 +261,16 @@ link this Leaflet layer to a Recline doc
                   
      		             } else {
           return null;
         }
-      } else if (value && value.slice) {                        
                                     
                                  
                                      
                     
      [ lon, lat ]
                         		                            
              return {
+      } else if (value && value.slice) {
                         		           
                                     
                                  
                                      
                     
      [ lon, lat ]
                         		                            
              return {
           "type": "Point",
           "coordinates": [value[0], value[1]]
         };
-      } else if (value && value.lat) {
                         		           
                                     
                                  
                                      
                     
      of form { lat: ..., lon: ...}
                         		                            
              return {
+      } else if (value && value.lat) {
                         		           
                                     
                                  
                                      
                     
      of form { lat: ..., lon: ...}
                         		                            
              return {
           "type": "Point",
           "coordinates": [value.lon || value.lng, value.lat]
         };
-      }
                         		           
                                     
                                  
                                      
                     
      We o/w assume that contents of the field are a valid GeoJSON object
                         		                            
            return value;
-    } else if (this.state.get('lonField') && this.state.get('latField')){
                         		           
                                     
                                  
                                      
                     
      We'll create a GeoJSON like point object from the two lat/lon fields
                         		                            
            var lon = doc.get(this.state.get('lonField'));
+      }
                         		           
                                     
                                  
                                      
                     
      We o/w assume that contents of the field are a valid GeoJSON object
                         		                            
            return value;
+    } else if (this.state.get('lonField') && this.state.get('latField')){
                         		           
                                     
                                  
                                      
                     
      We'll create a GeoJSON like point object from the two lat/lon fields
                         		                            
            var lon = doc.get(this.state.get('lonField'));
       var lat = doc.get(this.state.get('latField'));
       if (!isNaN(parseFloat(lon)) && !isNaN(parseFloat(lat))) {
         return {
@@ -255,10 +280,10 @@ link this Leaflet layer to a Recline doc
                   
      		             }
     }
     return null;
-  },                        
                                     
                                  
                                      
                     
      Private: Check if there is a field with GeoJSON geometries or alternatively,
+  },             
      		           
                                     
                                  
                                      
                     
      Private: Check if there is a field with GeoJSON geometries or alternatively,
 two fields with lat/lon values.
      
 
-
      If not found, the user can define them via the UI form.
                         		                            
        _setupGeometryField: function(){
                         		           
                                     
                                  
                                      
                     
      should not overwrite if we have already set this (e.g. explicitly via state)
                         		                            
          if (!this._geomReady()) {
+
      If not found, the user can define them via the UI form.
                   
      		                            
        _setupGeometryField: function(){
                         		           
                                     
                                  
                                      
                     
      should not overwrite if we have already set this (e.g. explicitly via state)
                         		                            
          if (!this._geomReady()) {
       this.state.set({
         geomField: this._checkField(this.geometryFieldNames),
         latField: this._checkField(this.latitudeFieldNames),
@@ -266,7 +291,7 @@ two fields with lat/lon values.
      
       });
       this.menu.state.set(this.state.toJSON());
     }
-  },
                         		           
                                     
                                  
                                      
                     
      Private: Check if a field in the current model exists in the provided
+  },             
      		           
                                     
                                  
                                      
                     
      Private: Check if a field in the current model exists in the provided
 list of names.
                         		                            
        _checkField: function(fieldNames){
     var field;
     var modelFieldNames = this.model.fields.pluck('id');
@@ -277,18 +302,19 @@ list of names.
                   
      		             
       }
     }
     return null;
-  },                        
                                     
                                  
                                      
                     
      Private: Zoom to map to current features extent if any, or to the full
+  },             
      		           
                                     
                                  
                                      
                     
      Private: Zoom to map to current features extent if any, or to the full
 extent if none.
                         		                            
        _zoomToFeatures: function(){
     var bounds = this.features.getBounds();
-    if (bounds.getNorthEast()){
+    if (bounds && bounds.getNorthEast() && bounds.getSouthWest()){
       this.map.fitBounds(bounds);
     } else {
       this.map.setView([0, 0], 2);
     }
-  },
                         		           
                                     
                                  
                                      
                     
      Private: Sets up the Leaflet map control and the features layer.
      
+  },                   		           
                                     
                                  
                                      
                     
      Private: Sets up the Leaflet map control and the features layer.
      
 
 
      The map uses a base layer from MapQuest based
 on OpenStreetMap.
                         		                            
        _setupMap: function(){
+    var self = this;
     this.map = new L.Map(this.$map.get(0));
 
     var mapUrl = "http://otile{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png";
@@ -296,13 +322,21 @@ on OpenStreetMap.
                   
      		
               
                       
 
       
 
                               
                                     
                                  
                                      
                     
      Private: Helper function to select an option from a select list
                         		                            
        _selectOption: function(id,value){
+  },
                         		           
                                     
                                  
                                      
                     
      Private: Helper function to select an option from a select list
                         		                            
        _selectOption: function(id,value){
     var options = $('.' + id + ' > select > option');
     if (options){
       options.each(function(opt){
@@ -366,16 +400,20 @@ on OpenStreetMap.
                   
      		
 
 
 
 
 
 
 
                         
                                     
                                  
                                      
                     
      Define here events for UI elements
                         		                            
        events: {
+  ',
                         		           
                                     
                                  
                                      
                     
      Define here events for UI elements
                         		                            
        events: {
     'click .editor-update-map': 'onEditorSubmit',
     'change .editor-field-type': 'onFieldTypeChange',
-    'click #editor-auto-zoom': 'onAutoZoomChange'
+    'click #editor-auto-zoom': 'onAutoZoomChange',
+    'click #editor-cluster': 'onClusteringChange'
   },
 
   initialize: function(options) {
@@ -386,7 +424,7 @@ on OpenStreetMap.
                   
      		
        
      
                             
                                     
                                  
                                      
                     
      Public: Adds the necessary elements to the page.
      
+  },                   		           
                                     
                                  
                                      
                     
      Public: Adds the necessary elements to the page.
      
 
 
      Also sets up the editor fields and the map if necessary.
                         		                            
        render: function() {
     var self = this;
@@ -405,16 +443,20 @@ on OpenStreetMap.
                   
      		
     
       
           
       
          
      
   
 
     
                                  
                                     
                                  
                                      
                     
      UI Event handlers
                         		                            
                         		           
                                     
                                  
                                      
                     
      Public: Update map with user options
      
+  },                   		           
                                     
                                  
                                      
                     
      UI Event handlers
                         		                            
                         		           
                                     
                                  
                                      
                     
      Public: Update map with user options
      
 
 
      Right now the only configurable option is what field(s) contains the
 location information.
                         		                            
        onEditorSubmit: function(e){
@@ -433,7 +475,7 @@ location information.
                   
      		             
       });
     }
     return false;
-  },                        
                                     
                                  
                                      
                     
      Public: Shows the relevant select lists depending on the location field
+  },             
      		           
                                     
                                  
                                      
                     
      Public: Shows the relevant select lists depending on the location field
 type selected.
                         		                            
        onFieldTypeChange: function(e){
     if (e.target.value == 'geom'){
         this.el.find('.editor-field-type-geom').show();
@@ -446,7 +488,11 @@ type selected.
                   
      		             
 
   onAutoZoomChange: function(e){
     this.state.set({autoZoom: !this.state.get('autoZoom')});
-  },                        
                                     
                                  
                                      
                     
      Private: Helper function to select an option from a select list
                         		                            
        _selectOption: function(id,value){
+  },
+
+  onClusteringChange: function(e){
+    this.state.set({cluster: !this.state.get('cluster')});
+  },
                         		           
                                     
                                  
                                      
                     
      Private: Helper function to select an option from a select list
                         		                            
        _selectOption: function(id,value){
     var options = this.el.find('.' + id + ' > select > option');
     if (options){
       options.each(function(opt){
diff --git a/docs/src/view.multiview.html b/docs/src/view.multiview.html
index 20ce53b2..d1f2f383 100644
--- a/docs/src/view.multiview.html
+++ b/docs/src/view.multiview.html
@@ -1,4 +1,4 @@
-      view.multiview.js           
           
                            
                      
                              
                     view.multiview.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      /*jshint multistr:true */
                         		           
                                     
                                  
                                      
                     
      Standard JS module setup
                         		                            
      this.recline = this.recline || {};
+      view.multiview.js           
           
                            
                      
                              
                     view.multiview.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      /*jshint multistr:true */
                         		           
                                     
                                  
                                      
                     
      Standard JS module setup
                         		                            
      this.recline = this.recline || {};
 this.recline.View = this.recline.View || {};
 
 (function($, my) {
                         		           
                                     
                                  
                                      
                     
      MultiView
      
@@ -93,7 +93,7 @@ initialized the MultiView with the relevant views themselves.
                     <div class="recline-data-explorer"> \
     <div class="alert-messages"></div> \
     \
-    <div class="header"> \
+    <div class="header clearfix"> \
       <div class="navigation"> \
         <div class="btn-group" data-toggle="buttons-radio"> \
         {{#views}} \
@@ -112,7 +112,6 @@ initialized the MultiView with the relevant views themselves.
                           </div> \
       </div> \
       <div class="query-editor-here" style="display:inline;"></div> \
-      <div class="clearfix"></div> \
     </div> \
     <div class="data-view-sidebar"></div> \
     <div class="data-view-container"></div> \
diff --git a/docs/src/view.slickgrid.html b/docs/src/view.slickgrid.html
index 41b5cafd..0745f9c4 100644
--- a/docs/src/view.slickgrid.html
+++ b/docs/src/view.slickgrid.html
@@ -1,4 +1,4 @@
-      view.slickgrid.js           
           
                            
                      
                              
                     view.slickgrid.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      /*jshint multistr:true */
+      view.slickgrid.js           
           
                            
                      
                              
                     view.slickgrid.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      /*jshint multistr:true */
 
 this.recline = this.recline || {};
 this.recline.View = this.recline.View || {};
diff --git a/docs/src/view.timeline.html b/docs/src/view.timeline.html
index 04956d6d..cc25f584 100644
--- a/docs/src/view.timeline.html
+++ b/docs/src/view.timeline.html
@@ -1,4 +1,4 @@
-      view.timeline.js           
           
                            
                      
                              
                     view.timeline.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      /*jshint multistr:true */
+      view.timeline.js           
           
                            
                      
                              
                     view.timeline.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      /*jshint multistr:true */
 
 this.recline = this.recline || {};
 this.recline.View = this.recline.View || {};
diff --git a/docs/src/view.transform.html b/docs/src/view.transform.html
index e311eced..b5019a47 100644
--- a/docs/src/view.transform.html
+++ b/docs/src/view.transform.html
@@ -1,4 +1,4 @@
-      view.transform.js           
           
                            
                      
                              
                     view.transform.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      /*jshint multistr:true */
+      view.transform.js           
           
                            
                      
                              
                     view.transform.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      /*jshint multistr:true */
 
 this.recline = this.recline || {};
 this.recline.View = this.recline.View || {};
                         		           
                                     
                                  
                                      
                     
      Views module following classic module pattern
                         		                            
      (function($, my) {
                         		           
                                     
                                  
                                      
                     
      ColumnTransform
      
diff --git a/docs/src/widget.facetviewer.html b/docs/src/widget.facetviewer.html
index e3144459..61ec2ff5 100644
--- a/docs/src/widget.facetviewer.html
+++ b/docs/src/widget.facetviewer.html
@@ -1,24 +1,29 @@
-      widget.facetviewer.js           
           
                            
                      
                              
                     widget.facetviewer.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      /*jshint multistr:true */
+      widget.facetviewer.js           
           
                            
                      
                              
                     widget.facetviewer.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      /*jshint multistr:true */
 
 this.recline = this.recline || {};
 this.recline.View = this.recline.View || {};
 
-(function($, my) {
+(function($, my) {
                         		           
                                     
                                  
                                      
                     
      FacetViewer
      
 
-my.FacetViewer = Backbone.View.extend({
-  className: 'recline-facet-viewer well', 
+
      Widget for displaying facets 
      
+
+
      Usage:
      
+
+
       var viewer = new FacetViewer({
+   model: dataset
+ });
+
                         		                            
      my.FacetViewer = Backbone.View.extend({
+  className: 'recline-facet-viewer', 
   template: ' \
-    <a class="close js-hide" href="#">&times;</a> \
-    <div class="facets row"> \
-      <div class="span1"> \
-        <h3>Facets</h3> \
-      </div> \
+    <div class="facets"> \
       {{#facets}} \
-      <div class="facet-summary span2 dropdown" data-facet="{{id}}"> \
-        <a class="btn dropdown-toggle" data-toggle="dropdown" href="#"><i class="icon-chevron-down"></i> {{id}} {{label}}</a> \
-        <ul class="facet-items dropdown-menu"> \
+      <div class="facet-summary" data-facet="{{id}}"> \
+        <h3> \
+          {{id}} \
+        </h3> \
+        <ul class="facet-items"> \
         {{#terms}} \
-          <li><a class="facet-choice js-facet-filter" data-value="{{term}}">{{term}} ({{count}})</a></li> \
+          <li><a class="facet-choice js-facet-filter" data-value="{{term}}" href="#{{term}}">{{term}} ({{count}})</a></li> \
         {{/terms}} \
         {{#entries}} \
           <li><a class="facet-choice js-facet-filter" data-value="{{time}}">{{term}} ({{count}})</a></li> \
@@ -30,7 +35,6 @@
   ',
 
   events: {
-    'click .js-hide': 'onHide',
     'click .js-facet-filter': 'onFacetFilter'
   },
   initialize: function(model) {
@@ -42,10 +46,9 @@
   },
   render: function() {
     var tmplData = {
-      facets: this.model.facets.toJSON(),
       fields: this.model.fields.toJSON()
     };
-    tmplData.facets = _.map(tmplData.facets, function(facet) {
+    tmplData.facets = _.map(this.model.facets.toJSON(), function(facet) {
       if (facet._type === 'date_histogram') {
         facet.entries = _.map(facet.entries, function(entry) {
           entry.term = new Date(entry.time).toDateString();
@@ -55,7 +58,7 @@
       return facet;
     });
     var templated = Mustache.render(this.template, tmplData);
-    this.el.html(templated);
                         		           
                                     
                                  
                                      
                     
      are there actually any facets to show?
                         		                            
          if (this.model.facets.length > 0) {
+    this.el.html(templated);
                         		           
                                     
                                  
                                      
                     
      are there actually any facets to show?
                         		                            
          if (this.model.facets.length > 0) {
       this.el.show();
     } else {
       this.el.hide();
@@ -66,10 +69,11 @@
     this.el.hide();
   },
   onFacetFilter: function(e) {
+    e.preventDefault();
     var $target= $(e.target);
     var fieldId = $target.closest('.facet-summary').attr('data-facet');
     var value = $target.attr('data-value');
-    this.model.queryState.addTermFilter(fieldId, value);
+    this.model.queryState.addFilter({type: 'term', field: fieldId, term: value});
                         		           
                                     
                                  
                                      
                     
      have to trigger explicitly for some reason
                         		                            
          this.model.query();
   }
 });
 
diff --git a/docs/src/widget.fields.html b/docs/src/widget.fields.html
index ced40695..5d2b2cfd 100644
--- a/docs/src/widget.fields.html
+++ b/docs/src/widget.fields.html
@@ -1,4 +1,4 @@
-      widget.fields.js           
           
                            
                      
                              
                     widget.fields.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      /*jshint multistr:true */
                         		           
                                     
                                  
                                      
                     
      Field Info
      
+      widget.fields.js           
           
                            
                      
                              
                     widget.fields.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      /*jshint multistr:true */
                         		           
                                     
                                  
                                      
                     
      Field Info
      
 
 
      For each field
      
 
diff --git a/docs/src/widget.filtereditor.html b/docs/src/widget.filtereditor.html
index 2b02a8c7..08a94a2b 100644
--- a/docs/src/widget.filtereditor.html
+++ b/docs/src/widget.filtereditor.html
@@ -1,4 +1,4 @@
-      widget.filtereditor.js           
           
                            
                      
                              
                     widget.filtereditor.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      /*jshint multistr:true */
+      widget.filtereditor.js           
           
                            
                      
                              
                     widget.filtereditor.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      /*jshint multistr:true */
 
 this.recline = this.recline || {};
 this.recline.View = this.recline.View || {};
@@ -120,8 +120,7 @@
     $target.hide();
     var filterType = $target.find('select.filterType').val();
     var field      = $target.find('select.fields').val();
-    var fieldType  = this.model.fields.find(function (e) { return e.get('id') === field }).get('type');
-    this.model.queryState.addFilter({type: filterType, field: field, fieldType: fieldType});
                         		           
                                     
                                  
                                      
                     
      trigger render explicitly as queryState change will not be triggered (as blank value for filter)
                         		                            
          this.render();
+    this.model.queryState.addFilter({type: filterType, field: field});
                         		           
                                     
                                  
                                      
                     
      trigger render explicitly as queryState change will not be triggered (as blank value for filter)
                         		                            
          this.render();
   },
   onRemoveFilter: function(e) {
     e.preventDefault();
diff --git a/docs/src/widget.pager.html b/docs/src/widget.pager.html
index 101da7a1..78a0925d 100644
--- a/docs/src/widget.pager.html
+++ b/docs/src/widget.pager.html
@@ -1,4 +1,4 @@
-      widget.pager.js           
           
                            
                      
                              
                     widget.pager.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      /*jshint multistr:true */
+      widget.pager.js           
           
                            
                      
                              
                     widget.pager.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      /*jshint multistr:true */
 
 this.recline = this.recline || {};
 this.recline.View = this.recline.View || {};
diff --git a/docs/src/widget.queryeditor.html b/docs/src/widget.queryeditor.html
index 3ae1ed06..38f6e2f3 100644
--- a/docs/src/widget.queryeditor.html
+++ b/docs/src/widget.queryeditor.html
@@ -1,4 +1,4 @@
-      widget.queryeditor.js           
           
                            
                      
                              
                     widget.queryeditor.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      /*jshint multistr:true */
+      widget.queryeditor.js           
           
                            
                      
                              
                     widget.queryeditor.js             
                       		                               
                                                         
                                  
                                      
                                        		                            
      /*jshint multistr:true */
 
 this.recline = this.recline || {};
 this.recline.View = this.recline.View || {};
diff --git a/test/built.html b/test/built.html
index 8e3ddfb1..9728b5b8 100644
--- a/test/built.html
+++ b/test/built.html
@@ -8,8 +8,8 @@
   
 
   
-  
-  
+  
+  
   
   
   
diff --git a/test/index.html b/test/index.html
index d0c688ba..6d3463f9 100644
--- a/test/index.html
+++ b/test/index.html
@@ -9,8 +9,8 @@
   
 
   
-  
-  
+  
+  
   
   
   
diff --git a/vendor/backbone/0.5.1/backbone.js b/vendor/backbone/0.5.1/backbone.js
deleted file mode 100644
index 18d48438..00000000
--- a/vendor/backbone/0.5.1/backbone.js
+++ /dev/null
@@ -1,1149 +0,0 @@
-//     Backbone.js 0.5.1
-//     (c) 2010 Jeremy Ashkenas, DocumentCloud Inc.
-//     Backbone may be freely distributed under the MIT license.
-//     For all details and documentation:
-//     http://documentcloud.github.com/backbone
-
-(function(){
-
-  // Initial Setup
-  // -------------
-
-  // Save a reference to the global object.
-  var root = this;
-
-  // Save the previous value of the `Backbone` variable.
-  var previousBackbone = root.Backbone;
-
-  // The top-level namespace. All public Backbone classes and modules will
-  // be attached to this. Exported for both CommonJS and the browser.
-  var Backbone;
-  if (typeof exports !== 'undefined') {
-    Backbone = exports;
-  } else {
-    Backbone = root.Backbone = {};
-  }
-
-  // Current version of the library. Keep in sync with `package.json`.
-  Backbone.VERSION = '0.5.1';
-
-  // Require Underscore, if we're on the server, and it's not already present.
-  var _ = root._;
-  if (!_ && (typeof require !== 'undefined')) _ = require('underscore')._;
-
-  // For Backbone's purposes, jQuery or Zepto owns the `$` variable.
-  var $ = root.jQuery || root.Zepto;
-
-  // Runs Backbone.js in *noConflict* mode, returning the `Backbone` variable
-  // to its previous owner. Returns a reference to this Backbone object.
-  Backbone.noConflict = function() {
-    root.Backbone = previousBackbone;
-    return this;
-  };
-
-  // Turn on `emulateHTTP` to use support legacy HTTP servers. Setting this option will
-  // fake `"PUT"` and `"DELETE"` requests via the `_method` parameter and set a
-  // `X-Http-Method-Override` header.
-  Backbone.emulateHTTP = false;
-
-  // Turn on `emulateJSON` to support legacy servers that can't deal with direct
-  // `application/json` requests ... will encode the body as
-  // `application/x-www-form-urlencoded` instead and will send the model in a
-  // form param named `model`.
-  Backbone.emulateJSON = false;
-
-  // Backbone.Events
-  // -----------------
-
-  // A module that can be mixed in to *any object* in order to provide it with
-  // custom events. You may `bind` or `unbind` a callback function to an event;
-  // `trigger`-ing an event fires all callbacks in succession.
-  //
-  //     var object = {};
-  //     _.extend(object, Backbone.Events);
-  //     object.bind('expand', function(){ alert('expanded'); });
-  //     object.trigger('expand');
-  //
-  Backbone.Events = {
-
-    // Bind an event, specified by a string name, `ev`, to a `callback` function.
-    // Passing `"all"` will bind the callback to all events fired.
-    bind : function(ev, callback) {
-      var calls = this._callbacks || (this._callbacks = {});
-      var list  = calls[ev] || (calls[ev] = []);
-      list.push(callback);
-      return this;
-    },
-
-    // Remove one or many callbacks. If `callback` is null, removes all
-    // callbacks for the event. If `ev` is null, removes all bound callbacks
-    // for all events.
-    unbind : function(ev, callback) {
-      var calls;
-      if (!ev) {
-        this._callbacks = {};
-      } else if (calls = this._callbacks) {
-        if (!callback) {
-          calls[ev] = [];
-        } else {
-          var list = calls[ev];
-          if (!list) return this;
-          for (var i = 0, l = list.length; i < l; i++) {
-            if (callback === list[i]) {
-              list[i] = null;
-              break;
-            }
-          }
-        }
-      }
-      return this;
-    },
-
-    // Trigger an event, firing all bound callbacks. Callbacks are passed the
-    // same arguments as `trigger` is, apart from the event name.
-    // Listening for `"all"` passes the true event name as the first argument.
-    trigger : function(eventName) {
-      var list, calls, ev, callback, args;
-      var both = 2;
-      if (!(calls = this._callbacks)) return this;
-      while (both--) {
-        ev = both ? eventName : 'all';
-        if (list = calls[ev]) {
-          for (var i = 0, l = list.length; i < l; i++) {
-            if (!(callback = list[i])) {
-              list.splice(i, 1); i--; l--;
-            } else {
-              args = both ? Array.prototype.slice.call(arguments, 1) : arguments;
-              callback.apply(this, args);
-            }
-          }
-        }
-      }
-      return this;
-    }
-
-  };
-
-  // Backbone.Model
-  // --------------
-
-  // Create a new model, with defined attributes. A client id (`cid`)
-  // is automatically generated and assigned for you.
-  Backbone.Model = function(attributes, options) {
-    var defaults;
-    attributes || (attributes = {});
-    if (defaults = this.defaults) {
-      if (_.isFunction(defaults)) defaults = defaults();
-      attributes = _.extend({}, defaults, attributes);
-    }
-    this.attributes = {};
-    this._escapedAttributes = {};
-    this.cid = _.uniqueId('c');
-    this.set(attributes, {silent : true});
-    this._changed = false;
-    this._previousAttributes = _.clone(this.attributes);
-    if (options && options.collection) this.collection = options.collection;
-    this.initialize(attributes, options);
-  };
-
-  // Attach all inheritable methods to the Model prototype.
-  _.extend(Backbone.Model.prototype, Backbone.Events, {
-
-    // A snapshot of the model's previous attributes, taken immediately
-    // after the last `"change"` event was fired.
-    _previousAttributes : null,
-
-    // Has the item been changed since the last `"change"` event?
-    _changed : false,
-
-    // The default name for the JSON `id` attribute is `"id"`. MongoDB and
-    // CouchDB users may want to set this to `"_id"`.
-    idAttribute : 'id',
-
-    // Initialize is an empty function by default. Override it with your own
-    // initialization logic.
-    initialize : function(){},
-
-    // Return a copy of the model's `attributes` object.
-    toJSON : function() {
-      return _.clone(this.attributes);
-    },
-
-    // Get the value of an attribute.
-    get : function(attr) {
-      return this.attributes[attr];
-    },
-
-    // Get the HTML-escaped value of an attribute.
-    escape : function(attr) {
-      var html;
-      if (html = this._escapedAttributes[attr]) return html;
-      var val = this.attributes[attr];
-      return this._escapedAttributes[attr] = escapeHTML(val == null ? '' : '' + val);
-    },
-
-    // Returns `true` if the attribute contains a value that is not null
-    // or undefined.
-    has : function(attr) {
-      return this.attributes[attr] != null;
-    },
-
-    // Set a hash of model attributes on the object, firing `"change"` unless you
-    // choose to silence it.
-    set : function(attrs, options) {
-
-      // Extract attributes and options.
-      options || (options = {});
-      if (!attrs) return this;
-      if (attrs.attributes) attrs = attrs.attributes;
-      var now = this.attributes, escaped = this._escapedAttributes;
-
-      // Run validation.
-      if (!options.silent && this.validate && !this._performValidation(attrs, options)) return false;
-
-      // Check for changes of `id`.
-      if (this.idAttribute in attrs) this.id = attrs[this.idAttribute];
-
-      // We're about to start triggering change events.
-      var alreadyChanging = this._changing;
-      this._changing = true;
-
-      // Update attributes.
-      for (var attr in attrs) {
-        var val = attrs[attr];
-        if (!_.isEqual(now[attr], val)) {
-          now[attr] = val;
-          delete escaped[attr];
-          this._changed = true;
-          if (!options.silent) this.trigger('change:' + attr, this, val, options);
-        }
-      }
-
-      // Fire the `"change"` event, if the model has been changed.
-      if (!alreadyChanging && !options.silent && this._changed) this.change(options);
-      this._changing = false;
-      return this;
-    },
-
-    // Remove an attribute from the model, firing `"change"` unless you choose
-    // to silence it. `unset` is a noop if the attribute doesn't exist.
-    unset : function(attr, options) {
-      if (!(attr in this.attributes)) return this;
-      options || (options = {});
-      var value = this.attributes[attr];
-
-      // Run validation.
-      var validObj = {};
-      validObj[attr] = void 0;
-      if (!options.silent && this.validate && !this._performValidation(validObj, options)) return false;
-
-      // Remove the attribute.
-      delete this.attributes[attr];
-      delete this._escapedAttributes[attr];
-      if (attr == this.idAttribute) delete this.id;
-      this._changed = true;
-      if (!options.silent) {
-        this.trigger('change:' + attr, this, void 0, options);
-        this.change(options);
-      }
-      return this;
-    },
-
-    // Clear all attributes on the model, firing `"change"` unless you choose
-    // to silence it.
-    clear : function(options) {
-      options || (options = {});
-      var attr;
-      var old = this.attributes;
-
-      // Run validation.
-      var validObj = {};
-      for (attr in old) validObj[attr] = void 0;
-      if (!options.silent && this.validate && !this._performValidation(validObj, options)) return false;
-
-      this.attributes = {};
-      this._escapedAttributes = {};
-      this._changed = true;
-      if (!options.silent) {
-        for (attr in old) {
-          this.trigger('change:' + attr, this, void 0, options);
-        }
-        this.change(options);
-      }
-      return this;
-    },
-
-    // Fetch the model from the server. If the server's representation of the
-    // model differs from its current attributes, they will be overriden,
-    // triggering a `"change"` event.
-    fetch : function(options) {
-      options || (options = {});
-      var model = this;
-      var success = options.success;
-      options.success = function(resp, status, xhr) {
-        if (!model.set(model.parse(resp, xhr), options)) return false;
-        if (success) success(model, resp);
-      };
-      options.error = wrapError(options.error, model, options);
-      return (this.sync || Backbone.sync).call(this, 'read', this, options);
-    },
-
-    // Set a hash of model attributes, and sync the model to the server.
-    // If the server returns an attributes hash that differs, the model's
-    // state will be `set` again.
-    save : function(attrs, options) {
-      options || (options = {});
-      if (attrs && !this.set(attrs, options)) return false;
-      var model = this;
-      var success = options.success;
-      options.success = function(resp, status, xhr) {
-        if (!model.set(model.parse(resp, xhr), options)) return false;
-        if (success) success(model, resp, xhr);
-      };
-      options.error = wrapError(options.error, model, options);
-      var method = this.isNew() ? 'create' : 'update';
-      return (this.sync || Backbone.sync).call(this, method, this, options);
-    },
-
-    // Destroy this model on the server if it was already persisted. Upon success, the model is removed
-    // from its collection, if it has one.
-    destroy : function(options) {
-      options || (options = {});
-      if (this.isNew()) return this.trigger('destroy', this, this.collection, options);
-      var model = this;
-      var success = options.success;
-      options.success = function(resp) {
-        model.trigger('destroy', model, model.collection, options);
-        if (success) success(model, resp);
-      };
-      options.error = wrapError(options.error, model, options);
-      return (this.sync || Backbone.sync).call(this, 'delete', this, options);
-    },
-
-    // Default URL for the model's representation on the server -- if you're
-    // using Backbone's restful methods, override this to change the endpoint
-    // that will be called.
-    url : function() {
-      var base = getUrl(this.collection) || this.urlRoot || urlError();
-      if (this.isNew()) return base;
-      return base + (base.charAt(base.length - 1) == '/' ? '' : '/') + encodeURIComponent(this.id);
-    },
-
-    // **parse** converts a response into the hash of attributes to be `set` on
-    // the model. The default implementation is just to pass the response along.
-    parse : function(resp, xhr) {
-      return resp;
-    },
-
-    // Create a new model with identical attributes to this one.
-    clone : function() {
-      return new this.constructor(this);
-    },
-
-    // A model is new if it has never been saved to the server, and lacks an id.
-    isNew : function() {
-      return this.id == null;
-    },
-
-    // Call this method to manually fire a `change` event for this model.
-    // Calling this will cause all objects observing the model to update.
-    change : function(options) {
-      this.trigger('change', this, options);
-      this._previousAttributes = _.clone(this.attributes);
-      this._changed = false;
-    },
-
-    // Determine if the model has changed since the last `"change"` event.
-    // If you specify an attribute name, determine if that attribute has changed.
-    hasChanged : function(attr) {
-      if (attr) return this._previousAttributes[attr] != this.attributes[attr];
-      return this._changed;
-    },
-
-    // Return an object containing all the attributes that have changed, or false
-    // if there are no changed attributes. Useful for determining what parts of a
-    // view need to be updated and/or what attributes need to be persisted to
-    // the server.
-    changedAttributes : function(now) {
-      now || (now = this.attributes);
-      var old = this._previousAttributes;
-      var changed = false;
-      for (var attr in now) {
-        if (!_.isEqual(old[attr], now[attr])) {
-          changed = changed || {};
-          changed[attr] = now[attr];
-        }
-      }
-      return changed;
-    },
-
-    // Get the previous value of an attribute, recorded at the time the last
-    // `"change"` event was fired.
-    previous : function(attr) {
-      if (!attr || !this._previousAttributes) return null;
-      return this._previousAttributes[attr];
-    },
-
-    // Get all of the attributes of the model at the time of the previous
-    // `"change"` event.
-    previousAttributes : function() {
-      return _.clone(this._previousAttributes);
-    },
-
-    // Run validation against a set of incoming attributes, returning `true`
-    // if all is well. If a specific `error` callback has been passed,
-    // call that instead of firing the general `"error"` event.
-    _performValidation : function(attrs, options) {
-      var error = this.validate(attrs);
-      if (error) {
-        if (options.error) {
-          options.error(this, error, options);
-        } else {
-          this.trigger('error', this, error, options);
-        }
-        return false;
-      }
-      return true;
-    }
-
-  });
-
-  // Backbone.Collection
-  // -------------------
-
-  // Provides a standard collection class for our sets of models, ordered
-  // or unordered. If a `comparator` is specified, the Collection will maintain
-  // its models in sort order, as they're added and removed.
-  Backbone.Collection = function(models, options) {
-    options || (options = {});
-    if (options.comparator) this.comparator = options.comparator;
-    _.bindAll(this, '_onModelEvent', '_removeReference');
-    this._reset();
-    if (models) this.reset(models, {silent: true});
-    this.initialize.apply(this, arguments);
-  };
-
-  // Define the Collection's inheritable methods.
-  _.extend(Backbone.Collection.prototype, Backbone.Events, {
-
-    // The default model for a collection is just a **Backbone.Model**.
-    // This should be overridden in most cases.
-    model : Backbone.Model,
-
-    // Initialize is an empty function by default. Override it with your own
-    // initialization logic.
-    initialize : function(){},
-
-    // The JSON representation of a Collection is an array of the
-    // models' attributes.
-    toJSON : function() {
-      return this.map(function(model){ return model.toJSON(); });
-    },
-
-    // Add a model, or list of models to the set. Pass **silent** to avoid
-    // firing the `added` event for every new model.
-    add : function(models, options) {
-      if (_.isArray(models)) {
-        for (var i = 0, l = models.length; i < l; i++) {
-          this._add(models[i], options);
-        }
-      } else {
-        this._add(models, options);
-      }
-      return this;
-    },
-
-    // Remove a model, or a list of models from the set. Pass silent to avoid
-    // firing the `removed` event for every model removed.
-    remove : function(models, options) {
-      if (_.isArray(models)) {
-        for (var i = 0, l = models.length; i < l; i++) {
-          this._remove(models[i], options);
-        }
-      } else {
-        this._remove(models, options);
-      }
-      return this;
-    },
-
-    // Get a model from the set by id.
-    get : function(id) {
-      if (id == null) return null;
-      return this._byId[id.id != null ? id.id : id];
-    },
-
-    // Get a model from the set by client id.
-    getByCid : function(cid) {
-      return cid && this._byCid[cid.cid || cid];
-    },
-
-    // Get the model at the given index.
-    at: function(index) {
-      return this.models[index];
-    },
-
-    // Force the collection to re-sort itself. You don't need to call this under normal
-    // circumstances, as the set will maintain sort order as each item is added.
-    sort : function(options) {
-      options || (options = {});
-      if (!this.comparator) throw new Error('Cannot sort a set without a comparator');
-      this.models = this.sortBy(this.comparator);
-      if (!options.silent) this.trigger('reset', this, options);
-      return this;
-    },
-
-    // Pluck an attribute from each model in the collection.
-    pluck : function(attr) {
-      return _.map(this.models, function(model){ return model.get(attr); });
-    },
-
-    // When you have more items than you want to add or remove individually,
-    // you can reset the entire set with a new list of models, without firing
-    // any `added` or `removed` events. Fires `reset` when finished.
-    reset : function(models, options) {
-      models  || (models = []);
-      options || (options = {});
-      this.each(this._removeReference);
-      this._reset();
-      this.add(models, {silent: true});
-      if (!options.silent) this.trigger('reset', this, options);
-      return this;
-    },
-
-    // Fetch the default set of models for this collection, resetting the
-    // collection when they arrive. If `add: true` is passed, appends the
-    // models to the collection instead of resetting.
-    fetch : function(options) {
-      options || (options = {});
-      var collection = this;
-      var success = options.success;
-      options.success = function(resp, status, xhr) {
-        collection[options.add ? 'add' : 'reset'](collection.parse(resp, xhr), options);
-        if (success) success(collection, resp);
-      };
-      options.error = wrapError(options.error, collection, options);
-      return (this.sync || Backbone.sync).call(this, 'read', this, options);
-    },
-
-    // Create a new instance of a model in this collection. After the model
-    // has been created on the server, it will be added to the collection.
-    // Returns the model, or 'false' if validation on a new model fails.
-    create : function(model, options) {
-      var coll = this;
-      options || (options = {});
-      model = this._prepareModel(model, options);
-      if (!model) return false;
-      var success = options.success;
-      options.success = function(nextModel, resp, xhr) {
-        coll.add(nextModel, options);
-        if (success) success(nextModel, resp, xhr);
-      };
-      model.save(null, options);
-      return model;
-    },
-
-    // **parse** converts a response into a list of models to be added to the
-    // collection. The default implementation is just to pass it through.
-    parse : function(resp, xhr) {
-      return resp;
-    },
-
-    // Proxy to _'s chain. Can't be proxied the same way the rest of the
-    // underscore methods are proxied because it relies on the underscore
-    // constructor.
-    chain: function () {
-      return _(this.models).chain();
-    },
-
-    // Reset all internal state. Called when the collection is reset.
-    _reset : function(options) {
-      this.length = 0;
-      this.models = [];
-      this._byId  = {};
-      this._byCid = {};
-    },
-
-    // Prepare a model to be added to this collection
-    _prepareModel: function(model, options) {
-      if (!(model instanceof Backbone.Model)) {
-        var attrs = model;
-        model = new this.model(attrs, {collection: this});
-        if (model.validate && !model._performValidation(attrs, options)) model = false;
-      } else if (!model.collection) {
-        model.collection = this;
-      }
-      return model;
-    },
-
-    // Internal implementation of adding a single model to the set, updating
-    // hash indexes for `id` and `cid` lookups.
-    // Returns the model, or 'false' if validation on a new model fails.
-    _add : function(model, options) {
-      options || (options = {});
-      model = this._prepareModel(model, options);
-      if (!model) return false;
-      var already = this.getByCid(model) || this.get(model);
-      if (already) throw new Error(["Can't add the same model to a set twice", already.id]);
-      this._byId[model.id] = model;
-      this._byCid[model.cid] = model;
-      var index = options.at != null ? options.at :
-                  this.comparator ? this.sortedIndex(model, this.comparator) :
-                  this.length;
-      this.models.splice(index, 0, model);
-      model.bind('all', this._onModelEvent);
-      this.length++;
-      if (!options.silent) model.trigger('add', model, this, options);
-      return model;
-    },
-
-    // Internal implementation of removing a single model from the set, updating
-    // hash indexes for `id` and `cid` lookups.
-    _remove : function(model, options) {
-      options || (options = {});
-      model = this.getByCid(model) || this.get(model);
-      if (!model) return null;
-      delete this._byId[model.id];
-      delete this._byCid[model.cid];
-      this.models.splice(this.indexOf(model), 1);
-      this.length--;
-      if (!options.silent) model.trigger('remove', model, this, options);
-      this._removeReference(model);
-      return model;
-    },
-
-    // Internal method to remove a model's ties to a collection.
-    _removeReference : function(model) {
-      if (this == model.collection) {
-        delete model.collection;
-      }
-      model.unbind('all', this._onModelEvent);
-    },
-
-    // Internal method called every time a model in the set fires an event.
-    // Sets need to update their indexes when models change ids. All other
-    // events simply proxy through. "add" and "remove" events that originate
-    // in other collections are ignored.
-    _onModelEvent : function(ev, model, collection, options) {
-      if ((ev == 'add' || ev == 'remove') && collection != this) return;
-      if (ev == 'destroy') {
-        this._remove(model, options);
-      }
-      if (model && ev === 'change:' + model.idAttribute) {
-        delete this._byId[model.previous(model.idAttribute)];
-        this._byId[model.id] = model;
-      }
-      this.trigger.apply(this, arguments);
-    }
-
-  });
-
-  // Underscore methods that we want to implement on the Collection.
-  var methods = ['forEach', 'each', 'map', 'reduce', 'reduceRight', 'find', 'detect',
-    'filter', 'select', 'reject', 'every', 'all', 'some', 'any', 'include',
-    'contains', 'invoke', 'max', 'min', 'sortBy', 'sortedIndex', 'toArray', 'size',
-    'first', 'rest', 'last', 'without', 'indexOf', 'lastIndexOf', 'isEmpty'];
-
-  // Mix in each Underscore method as a proxy to `Collection#models`.
-  _.each(methods, function(method) {
-    Backbone.Collection.prototype[method] = function() {
-      return _[method].apply(_, [this.models].concat(_.toArray(arguments)));
-    };
-  });
-
-  // Backbone.Router
-  // -------------------
-
-  // Routers map faux-URLs to actions, and fire events when routes are
-  // matched. Creating a new one sets its `routes` hash, if not set statically.
-  Backbone.Router = function(options) {
-    options || (options = {});
-    if (options.routes) this.routes = options.routes;
-    this._bindRoutes();
-    this.initialize.apply(this, arguments);
-  };
-
-  // Cached regular expressions for matching named param parts and splatted
-  // parts of route strings.
-  var namedParam    = /:([\w\d]+)/g;
-  var splatParam    = /\*([\w\d]+)/g;
-  var escapeRegExp  = /[-[\]{}()+?.,\\^$|#\s]/g;
-
-  // Set up all inheritable **Backbone.Router** properties and methods.
-  _.extend(Backbone.Router.prototype, Backbone.Events, {
-
-    // Initialize is an empty function by default. Override it with your own
-    // initialization logic.
-    initialize : function(){},
-
-    // Manually bind a single named route to a callback. For example:
-    //
-    //     this.route('search/:query/p:num', 'search', function(query, num) {
-    //       ...
-    //     });
-    //
-    route : function(route, name, callback) {
-      Backbone.history || (Backbone.history = new Backbone.History);
-      if (!_.isRegExp(route)) route = this._routeToRegExp(route);
-      Backbone.history.route(route, _.bind(function(fragment) {
-        var args = this._extractParameters(route, fragment);
-        callback.apply(this, args);
-        this.trigger.apply(this, ['route:' + name].concat(args));
-      }, this));
-    },
-
-    // Simple proxy to `Backbone.history` to save a fragment into the history.
-    navigate : function(fragment, triggerRoute) {
-      Backbone.history.navigate(fragment, triggerRoute);
-    },
-
-    // Bind all defined routes to `Backbone.history`. We have to reverse the
-    // order of the routes here to support behavior where the most general
-    // routes can be defined at the bottom of the route map.
-    _bindRoutes : function() {
-      if (!this.routes) return;
-      var routes = [];
-      for (var route in this.routes) {
-        routes.unshift([route, this.routes[route]]);
-      }
-      for (var i = 0, l = routes.length; i < l; i++) {
-        this.route(routes[i][0], routes[i][1], this[routes[i][1]]);
-      }
-    },
-
-    // Convert a route string into a regular expression, suitable for matching
-    // against the current location hash.
-    _routeToRegExp : function(route) {
-      route = route.replace(escapeRegExp, "\\$&")
-                   .replace(namedParam, "([^\/]*)")
-                   .replace(splatParam, "(.*?)");
-      return new RegExp('^' + route + '$');
-    },
-
-    // Given a route, and a URL fragment that it matches, return the array of
-    // extracted parameters.
-    _extractParameters : function(route, fragment) {
-      return route.exec(fragment).slice(1);
-    }
-
-  });
-
-  // Backbone.History
-  // ----------------
-
-  // Handles cross-browser history management, based on URL fragments. If the
-  // browser does not support `onhashchange`, falls back to polling.
-  Backbone.History = function() {
-    this.handlers = [];
-    _.bindAll(this, 'checkUrl');
-  };
-
-  // Cached regex for cleaning hashes.
-  var hashStrip = /^#*/;
-
-  // Cached regex for detecting MSIE.
-  var isExplorer = /msie [\w.]+/;
-
-  // Has the history handling already been started?
-  var historyStarted = false;
-
-  // Set up all inheritable **Backbone.History** properties and methods.
-  _.extend(Backbone.History.prototype, {
-
-    // The default interval to poll for hash changes, if necessary, is
-    // twenty times a second.
-    interval: 50,
-
-    // Get the cross-browser normalized URL fragment, either from the URL,
-    // the hash, or the override.
-    getFragment : function(fragment, forcePushState) {
-      if (fragment == null) {
-        if (this._hasPushState || forcePushState) {
-          fragment = window.location.pathname;
-          var search = window.location.search;
-          if (search) fragment += search;
-          if (fragment.indexOf(this.options.root) == 0) fragment = fragment.substr(this.options.root.length);
-        } else {
-          fragment = window.location.hash;
-        }
-      }
-      return fragment.replace(hashStrip, '');
-    },
-
-    // Start the hash change handling, returning `true` if the current URL matches
-    // an existing route, and `false` otherwise.
-    start : function(options) {
-
-      // Figure out the initial configuration. Do we need an iframe?
-      // Is pushState desired ... is it available?
-      if (historyStarted) throw new Error("Backbone.history has already been started");
-      this.options          = _.extend({}, {root: '/'}, this.options, options);
-      this._wantsPushState  = !!this.options.pushState;
-      this._hasPushState    = !!(this.options.pushState && window.history && window.history.pushState);
-      var fragment          = this.getFragment();
-      var docMode           = document.documentMode;
-      var oldIE             = (isExplorer.exec(navigator.userAgent.toLowerCase()) && (!docMode || docMode <= 7));
-      if (oldIE) {
-        this.iframe = $('