From 12d65f5801e63cb92058f57626b4e8c9fbd18d71 Mon Sep 17 00:00:00 2001 From: Brian Jacobel <bjacobel@gmail.com> Date: Mon, 25 Apr 2016 16:40:10 -0400 Subject: [PATCH] Use unminified picturefill in development --- lms/envs/common.py | 2 +- lms/static/js/spec/main.js | 2 +- lms/static/js_test.yml | 2 +- lms/static/lms/js/require-config.js | 2 +- pavelib/assets.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lms/envs/common.py b/lms/envs/common.py index 3220356fed6..7c8b28737a8 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -1257,7 +1257,7 @@ base_vendor_js = [ 'js/vendor/url.min.js', 'common/js/vendor/underscore.js', 'common/js/vendor/underscore.string.js', - 'common/js/vendor/picturefill.min.js', + 'common/js/vendor/picturefill.js', # Make some edX UI Toolkit utilities available in the global "edx" namespace 'edx-ui-toolkit/js/utils/global-loader.js', diff --git a/lms/static/js/spec/main.js b/lms/static/js/spec/main.js index a720526fd99..709ec843400 100644 --- a/lms/static/js/spec/main.js +++ b/lms/static/js/spec/main.js @@ -67,7 +67,7 @@ '_split': 'js/split', 'mathjax_delay_renderer': 'coffee/src/mathjax_delay_renderer', 'MathJaxProcessor': 'coffee/src/customwmd', - 'picturefill': 'common/js/vendor/picturefill.min', + 'picturefill': 'common/js/vendor/picturefill', 'draggabilly': 'xmodule_js/common_static/js/vendor/draggabilly', 'modernizr': 'xmodule_js/common_static/edx-pattern-library/js/modernizr-custom', 'afontgarde': 'xmodule_js/common_static/edx-pattern-library/js/afontgarde', diff --git a/lms/static/js_test.yml b/lms/static/js_test.yml index f59f9d47562..7b025f25772 100644 --- a/lms/static/js_test.yml +++ b/lms/static/js_test.yml @@ -68,7 +68,7 @@ lib_paths: - xmodule_js/common_static/js/vendor/slick.core.js - xmodule_js/common_static/js/vendor/slick.grid.js - xmodule_js/common_static/js/vendor/jquery.event.drag-2.2.js - - xmodule_js/common_static/common/js/vendor/picturefill.min.js + - xmodule_js/common_static/common/js/vendor/picturefill.js # Paths to source JavaScript files src_paths: diff --git a/lms/static/lms/js/require-config.js b/lms/static/lms/js/require-config.js index 766b8727912..5d5dc80f756 100644 --- a/lms/static/lms/js/require-config.js +++ b/lms/static/lms/js/require-config.js @@ -100,7 +100,7 @@ "handlebars": "js/vendor/ova/catch/js/handlebars-1.1.2", "tinymce": "js/vendor/tinymce/js/tinymce/tinymce.full.min", "jquery.tinymce": "js/vendor/tinymce/js/tinymce/jquery.tinymce.min", - "picturefill": "common/js/vendor/picturefill.min" + "picturefill": "common/js/vendor/picturefill" // end of files needed by OVA }, shim: { diff --git a/pavelib/assets.py b/pavelib/assets.py index 87bfdc4c8fe..28eda124cfb 100644 --- a/pavelib/assets.py +++ b/pavelib/assets.py @@ -47,7 +47,7 @@ SASS_LOAD_PATHS = [ NPM_INSTALLED_LIBRARIES = [ 'underscore/underscore.js', 'underscore.string/dist/underscore.string.js', - 'picturefill/dist/picturefill.min.js', + 'picturefill/dist/picturefill.js', 'backbone/backbone-min.js', ] -- GitLab