mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-04-28 04:07:32 -07:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
65 lines
4.1 KiB
Diff
65 lines
4.1 KiB
Diff
https://github.com/cyberdelia/django-pipeline/commit/ba7b8d0d1cb621521a2025fed3e60786a010836d
|
|
diff --git a/docs/configuration.rst b/docs/configuration.rst
|
|
index 4385e23..e200bc3 100644
|
|
--- a/docs/configuration.rst
|
|
+++ b/docs/configuration.rst
|
|
@@ -185,7 +185,7 @@ Other settings
|
|
(
|
|
(b'text/coffeescript', '.coffee'),
|
|
(b'text/less', '.less'),
|
|
- (b'application/javascript', '.js'),
|
|
+ (b'text/javascript', '.js'),
|
|
(b'text/x-sass', '.sass'),
|
|
(b'text/x-scss', '.scss')
|
|
)
|
|
diff --git a/tests/tests/test_template.py b/tests/tests/test_template.py
|
|
index 84b6957..a303d03 100644
|
|
--- a/tests/tests/test_template.py
|
|
+++ b/tests/tests/test_template.py
|
|
@@ -35,19 +35,19 @@ def test_package_css_disabled(self):
|
|
|
|
def test_package_js(self):
|
|
template = self.env.from_string(u"""{% compressed_js "scripts" %}""")
|
|
- self.assertEqual(u'<script type="application/javascript" src="/static/scripts.js" charset="utf-8"></script>', template.render())
|
|
+ self.assertEqual(u'<script type="text/javascript" src="/static/scripts.js" charset="utf-8"></script>', template.render())
|
|
|
|
def test_package_js_async(self):
|
|
template = self.env.from_string(u"""{% compressed_js "scripts_async" %}""")
|
|
- self.assertEqual(u'<script async type="application/javascript" src="/static/scripts_async.js" charset="utf-8"></script>', template.render())
|
|
+ self.assertEqual(u'<script async type="text/javascript" src="/static/scripts_async.js" charset="utf-8"></script>', template.render())
|
|
|
|
def test_package_js_defer(self):
|
|
template = self.env.from_string(u"""{% compressed_js "scripts_defer" %}""")
|
|
- self.assertEqual(u'<script defer type="application/javascript" src="/static/scripts_defer.js" charset="utf-8"></script>', template.render())
|
|
+ self.assertEqual(u'<script defer type="text/javascript" src="/static/scripts_defer.js" charset="utf-8"></script>', template.render())
|
|
|
|
def test_package_js_async_defer(self):
|
|
template = self.env.from_string(u"""{% compressed_js "scripts_async_defer" %}""")
|
|
- self.assertEqual(u'<script async defer type="application/javascript" src="/static/scripts_async_defer.js" charset="utf-8"></script>', template.render())
|
|
+ self.assertEqual(u'<script async defer type="text/javascript" src="/static/scripts_async_defer.js" charset="utf-8"></script>', template.render())
|
|
|
|
|
|
class DjangoTest(TestCase):
|
|
@@ -64,16 +64,16 @@ def test_compressed_css(self):
|
|
|
|
def test_compressed_js(self):
|
|
rendered = self.render_template(u"""{% load compressed %}{% compressed_js "scripts" %}""")
|
|
- self.assertEqual(u'<script type="application/javascript" src="/static/scripts.js" charset="utf-8"></script>', rendered)
|
|
+ self.assertEqual(u'<script type="text/javascript" src="/static/scripts.js" charset="utf-8"></script>', rendered)
|
|
|
|
def test_compressed_js_async(self):
|
|
rendered = self.render_template(u"""{% load compressed %}{% compressed_js "scripts_async" %}""")
|
|
- self.assertEqual(u'<script async type="application/javascript" src="/static/scripts_async.js" charset="utf-8"></script>', rendered)
|
|
+ self.assertEqual(u'<script async type="text/javascript" src="/static/scripts_async.js" charset="utf-8"></script>', rendered)
|
|
|
|
def test_compressed_js_defer(self):
|
|
rendered = self.render_template(u"""{% load compressed %}{% compressed_js "scripts_defer" %}""")
|
|
- self.assertEqual(u'<script defer type="application/javascript" src="/static/scripts_defer.js" charset="utf-8"></script>', rendered)
|
|
+ self.assertEqual(u'<script defer type="text/javascript" src="/static/scripts_defer.js" charset="utf-8"></script>', rendered)
|
|
|
|
def test_compressed_js_async_defer(self):
|
|
rendered = self.render_template(u"""{% load compressed %}{% compressed_js "scripts_async_defer" %}""")
|
|
- self.assertEqual(u'<script async defer type="application/javascript" src="/static/scripts_async_defer.js" charset="utf-8"></script>', rendered)
|
|
+ self.assertEqual(u'<script async defer type="text/javascript" src="/static/scripts_async_defer.js" charset="utf-8"></script>', rendered)
|
|
|