[#374] Update Recline to latest version of Recline

master branch. Remove fields widget.
ckan · Feb 11, 2013 · b4fec95 · b4fec95
1 parent 57afa6d
commit b4fec95
Show file tree

Hide file tree

Showing 74 changed files with 34,596 additions and 6,907 deletions.
diff --git a/ckanext/reclinepreview/theme/public/preview_recline.js b/ckanext/reclinepreview/theme/public/preview_recline.js
@@ -125,18 +125,26 @@ this.ckan.module('reclinepreview', function (jQuery, _) {
         }
       ];
 
+      var sidebarViews = [
+        {
+          id: 'filterEditor',
+          label: 'Filters',
+          view: new recline.View.FilterEditor({
+            model: dataset
+          })
+        }
+      ];
+
       var dataExplorer = new recline.View.MultiView({
         el: this.el,
         model: dataset,
         views: views,
+        sidebarViews: sidebarViews,
         config: {
           readOnly: true
         }
       });
 
-      // Hide the fields control by default
-      // (This should be done in recline!)
-      // jQuery('.menu-right a[data-action="fields"]', self.el).click();
     },
     normalizeFormat: function (format) {
       var out = format.toLowerCase();
@@ -152,4 +160,4 @@ this.ckan.module('reclinepreview', function (jQuery, _) {
       }
     }
   };
-});
+});
diff --git a/ckanext/reclinepreview/theme/public/resource.config b/ckanext/reclinepreview/theme/public/resource.config
@@ -1,8 +1,11 @@
 [IE conditional]
 
+lte IE 7 =
+    vendor/json/json2.js
+
 lte IE 8 =
-    vendor/flotr2/excanvas.js
-    vendor/leaflet/leaflet.ie.css
+    vendor/flot/excanvas.js
+    vendor/leaflet/0.4.4/leaflet.ie.css
     vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
 
 [depends]
@@ -12,29 +15,31 @@ main = base/main
 [groups]
 
 main =
-    vendor/underscore/underscore.js
-    vendor/backbone/backbone.js
-    vendor/mustache/mustache.js
-    vendor/bootstrap/bootstrap.js
-    vendor/flotr2/flotr2.js
-    vendor/leaflet/leaflet.js
+    vendor/underscore/1.4.2/underscore.js
+    vendor/backbone/0.9.2/backbone.js
+    vendor/mustache/0.5.0-dev/mustache.js
+    vendor/bootstrap/2.0.2/bootstrap.js
+    vendor/json/json2.js
+    vendor/flot/excanvas.js
+    vendor/flot/jquery.flot.js
+    vendor/leaflet/0.4.4/leaflet.js
     vendor/leaflet.markercluster/leaflet.markercluster.js
-    vendor/slickgrid/jquery-ui-1.8.16.custom.js
-    vendor/slickgrid/jquery.event.drag-2.0.js
-    vendor/slickgrid/slick.grid.js
-    vendor/moment/moment.js
+    vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
+    vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
+    vendor/slickgrid/2.0.1/slick.grid.js
+    vendor/moment/1.6.2/moment.js
 
     vendor/recline/recline.js
 
     preview_recline.js
 
-    vendor/bootstrap/css/bootstrap.css
-    vendor/leaflet/leaflet.css
-    vendor/leaflet/leaflet.ie.css
+    vendor/bootstrap/2.0.2/css/bootstrap.css
+    vendor/leaflet/0.4.4/leaflet.css
+    vendor/leaflet/0.4.4/leaflet.ie.css
     vendor/leaflet.markercluster/MarkerCluster.css
     vendor/leaflet.markercluster/MarkerCluster.Default.css
     vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
-    vendor/slickgrid/slick.grid.css
-    vendor/recline/css/recline.css
+    vendor/slickgrid/2.0.1/slick.grid.css
+    vendor/recline/recline.css
 
     css/recline.css