Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

assets tag add depends support #4

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions django_assets/templatetags/assets.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@ class AssetsNode(template.Node):
# For testing, to inject a mock bundle
BundleClass = Bundle

def __init__(self, filters, output, debug, files, childnodes):
def __init__(self, filters, depends, output, debug, files, childnodes):
self.childnodes = childnodes
self.output = output
self.files = files
self.depends = depends
self.filters = filters
self.debug = debug

Expand Down Expand Up @@ -60,6 +61,7 @@ def resolve_bundle(name):
*[resolve_bundle(resolve_var(f)) for f in self.files],
**{'output': resolve_var(self.output),
'filters': resolve_var(self.filters),
'depends': resolve_var(self.depends),
'debug': parse_debug_value(resolve_var(self.debug))})

def render(self, context):
Expand All @@ -79,6 +81,7 @@ def assets(parser, token):
filters = None
output = None
debug = None
depends = None
files = []

# parse the arguments
Expand Down Expand Up @@ -113,6 +116,8 @@ def assets(parser, token):
'template tag has been renamed to '
'"filters" for consistency reasons.',
ImminentDeprecationWarning)
elif name == 'depends':
depends = value
# positional arguments are source files
elif name is None:
files.append(value)
Expand All @@ -122,7 +127,7 @@ def assets(parser, token):
# capture until closing tag
childnodes = parser.parse(("endassets",))
parser.delete_first_token()
return AssetsNode(filters, output, debug, files, childnodes)
return AssetsNode(filters, depends, output, debug, files, childnodes)



Expand Down