Fix ups for dataviewer fanstatic

ckan · Sep 24, 2012 · d988baf · domoritz · Sep 24, 2012 · d988baf
1 parent 8ca5b50
commit d988baf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/ckan/lib/fanstatic_resources.py b/ckan/lib/fanstatic_resources.py
@@ -252,6 +252,6 @@ def create_resource(path, lib_name, count, inline=False):
                depend_base=False)
 
 create_library('datapreview', os.path.join(base_path, 'datapreview'),
-               depend_base=True)
+               depend_base=False)
 
 create_library('css', os.path.join(base_path, 'css'), depend_base=False)
diff --git a/ckan/public/base/datapreview/resource.config b/ckan/public/base/datapreview/resource.config
@@ -7,13 +7,10 @@ lte IE 8 = vendor/flotr2/excanvas.js
 
 [depends]
 
-datapreview-frame = vendor/jquery.js
-recline           = vendor/jquery.js
-recline           = vendor/jed.js
-pdf               = vendor/jquery.js
-pdf               = vendor/jed.js
-json              = vendor/jquery.js
-json              = vendor/jed.js
+datapreview-frame = base/main
+recline = base/main
+json = base/main
+pdf = base/main
 
 [groups]
 
@@ -45,7 +42,6 @@ recline =
 
 pdf =
     vendor/webL10n/l10n.js
-    vendor/pdfjs/pdf.js
     vendor/pdfviewer/compatibility.js
     vendor/pdfviewer/viewer.js
     pdf.js
@@ -56,4 +52,4 @@ pdf =
 json =
     json.js
 
-    css/json.css
+    css/json.css
diff --git a/ckan/templates/dataviewer/pdf.html b/ckan/templates/dataviewer/pdf.html
@@ -152,6 +152,6 @@
   {{ super() }}
   {% resource 'datapreview/pdf' %}
   <script>
-    var pdfjs_workerSrc = "{{ h.urls_for_resource('datapreview/vendor/pdfjs/pdf.js')[-1] }}";
+    var pdfjs_workerSrc = "{{ h.urls_for_resource('datapreview/vendor/pdfjs/pdf.js')[0] }}";
   </script>
 {% endblock %}