Unverified Commit b0336957 by David Ormsbee Committed by GitHub

Merge pull request #16477 from edx/ormsbee/consolidate_theme_js

Remove collection of JS bundles for themes.
parents a4095e49 255dc792
...@@ -251,10 +251,9 @@ class ThemePipelineMixin(PipelineMixin): ...@@ -251,10 +251,9 @@ class ThemePipelineMixin(PipelineMixin):
for theme in themes: for theme in themes:
css_packages = self.get_themed_packages(theme.theme_dir_name, settings.PIPELINE_CSS) css_packages = self.get_themed_packages(theme.theme_dir_name, settings.PIPELINE_CSS)
js_packages = self.get_themed_packages(theme.theme_dir_name, settings.PIPELINE_JS)
from pipeline.packager import Packager from pipeline.packager import Packager
packager = Packager(storage=self, css_packages=css_packages, js_packages=js_packages) packager = Packager(storage=self, css_packages=css_packages)
for package_name in packager.packages['css']: for package_name in packager.packages['css']:
package = packager.package_for('css', package_name) package = packager.package_for('css', package_name)
output_file = package.output_filename output_file = package.output_filename
...@@ -262,13 +261,6 @@ class ThemePipelineMixin(PipelineMixin): ...@@ -262,13 +261,6 @@ class ThemePipelineMixin(PipelineMixin):
packager.pack_stylesheets(package) packager.pack_stylesheets(package)
paths[output_file] = (self, output_file) paths[output_file] = (self, output_file)
yield output_file, output_file, True yield output_file, output_file, True
for package_name in packager.packages['js']:
package = packager.package_for('js', package_name)
output_file = package.output_filename
if self.packing:
packager.pack_javascripts(package)
paths[output_file] = (self, output_file)
yield output_file, output_file, True
super_class = super(ThemePipelineMixin, self) super_class = super(ThemePipelineMixin, self)
if hasattr(super_class, 'post_process'): if hasattr(super_class, 'post_process'):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment