diff --git a/ckan/lib/fanstatic_resources.py b/ckan/lib/fanstatic_resources.py index 5db07914521..dd15e175183 100644 --- 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 index 009d2699e6f..2a4e6d98a0b 100644 --- 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 \ No newline at end of file + css/json.css diff --git a/ckan/templates/dataviewer/pdf.html b/ckan/templates/dataviewer/pdf.html index e708c9532ec..f41bb5a91de 100644 --- a/ckan/templates/dataviewer/pdf.html +++ b/ckan/templates/dataviewer/pdf.html @@ -152,6 +152,6 @@ {{ super() }} {% resource 'datapreview/pdf' %} {% endblock %}