Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
django-pipeline
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
django-pipeline
Commits
e1c56f74
Commit
e1c56f74
authored
Mar 14, 2013
by
Timothée Peignier
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #199 from miki725/master
fix for #198 including unittest
parents
77153842
dafd5d4f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
1 deletions
+8
-1
AUTHORS
+1
-0
pipeline/compressors/__init__.py
+1
-1
tests/assets/css/urls.css
+3
-0
tests/tests/test_compressor.py
+3
-0
No files found.
AUTHORS
View file @
e1c56f74
...
@@ -48,3 +48,4 @@ or just made Pipeline more awesome.
...
@@ -48,3 +48,4 @@ or just made Pipeline more awesome.
* Venelin Stoykov <venelin@magicsolutions.bg>
* Venelin Stoykov <venelin@magicsolutions.bg>
* Victor Shnayder <victor@mitx.mit.edu>
* Victor Shnayder <victor@mitx.mit.edu>
* Zenobius Jiricek <zenobius.jiricek@gmail.com>
* Zenobius Jiricek <zenobius.jiricek@gmail.com>
* Miroslav Shubernetskiy <miroslav@miki725.com>
pipeline/compressors/__init__.py
View file @
e1c56f74
...
@@ -15,7 +15,7 @@ from pipeline.storage import default_storage
...
@@ -15,7 +15,7 @@ from pipeline.storage import default_storage
from
pipeline.utils
import
to_class
,
relpath
from
pipeline.utils
import
to_class
,
relpath
from
pipeline.exceptions
import
CompressorError
from
pipeline.exceptions
import
CompressorError
URL_DETECTOR
=
r'url\([\'"]?([^\s)]+\.[a-z]+[
\?\#\d\w
]*)[\'"]?\)'
URL_DETECTOR
=
r'url\([\'"]?([^\s)]+\.[a-z]+[
^\'"\s
]*)[\'"]?\)'
URL_REPLACER
=
r'url\(__EMBED__(.+?)(\?\d+)?\)'
URL_REPLACER
=
r'url\(__EMBED__(.+?)(\?\d+)?\)'
DEFAULT_TEMPLATE_FUNC
=
"template"
DEFAULT_TEMPLATE_FUNC
=
"template"
...
...
tests/assets/css/urls.css
View file @
e1c56f74
...
@@ -9,6 +9,9 @@
...
@@ -9,6 +9,9 @@
.relative-url
{
.relative-url
{
background-image
:
url(../images/sprite-buttons.png)
;
background-image
:
url(../images/sprite-buttons.png)
;
}
}
.relative-url-querystring
{
background-image
:
url(../images/sprite-buttons.png?v=1.0#foo=bar)
;
}
.absolute-url
{
.absolute-url
{
background-image
:
url(/images/sprite-buttons.png)
;
background-image
:
url(/images/sprite-buttons.png)
;
}
}
...
...
tests/tests/test_compressor.py
View file @
e1c56f74
...
@@ -115,6 +115,9 @@ class CompressorTest(TestCase):
...
@@ -115,6 +115,9 @@ class CompressorTest(TestCase):
.relative-url {
.relative-url {
background-image: url(../pipeline/images/sprite-buttons.png);
background-image: url(../pipeline/images/sprite-buttons.png);
}
}
.relative-url-querystring {
background-image: url(../pipeline/images/sprite-buttons.png?v=1.0#foo=bar);
}
.absolute-url {
.absolute-url {
background-image: url(/images/sprite-buttons.png);
background-image: url(/images/sprite-buttons.png);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment