Skip to content
This repository has been archived by the owner on Oct 31, 2019. It is now read-only.

Commit

Permalink
Merge pull request #3 from LubergAlexander/master
Browse files Browse the repository at this point in the history
Added support for Flask < 0.10
  • Loading branch information
nickjj committed Jan 31, 2016
2 parents daf6ce3 + 5047732 commit f2283d7
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 9 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ docs/_build/
.*.sw*
*~
.idea/
*.iml
.mr.developer.cfg
.project
.pydevproject
Expand Down
26 changes: 17 additions & 9 deletions flask_webpack/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,18 @@ def init_app(self, app):
if app.config.get('DEBUG', False):
app.before_request(self._refresh_webpack_stats)

app.add_template_global(self.javascript_tag)
app.add_template_global(self.stylesheet_tag)
app.add_template_global(self.asset_url_for)
if hasattr(app, 'add_template_global'):
app.add_template_global(self.javascript_tag)
app.add_template_global(self.stylesheet_tag)
app.add_template_global(self.asset_url_for)
else:
# Flask < 0.10
ctx = {
'javascript_tag': self.javascript_tag,
'stylesheet_tag': self.stylesheet_tag,
'asset_url_for': self.asset_url_for
}
app.context_processor(lambda: ctx)

def _set_asset_paths(self, app):
"""
Expand Down Expand Up @@ -73,7 +82,7 @@ def javascript_tag(self, *args):
"""
Convenience tag to output 1 or more javascript tags.
:param *args: 1 or more javascript file names
:param args: 1 or more javascript file names
:return: Script tag(s) containing the asset
"""
tags = []
Expand All @@ -89,7 +98,7 @@ def stylesheet_tag(self, *args):
"""
Convenience tag to output 1 or more stylesheet tags.
:param *args: 1 or more stylesheet file names
:param args: 1 or more stylesheet file names
:return: Link tag(s) containing the asset
"""
tags = []
Expand All @@ -114,8 +123,7 @@ def asset_url_for(self, asset):
if '//' in asset:
return asset

for key in self.assets:
if key == asset:
return '{0}{1}'.format(self.assets_url, self.assets[key])
if asset not in self.assets:
return None

return None
return '{0}{1}'.format(self.assets_url, self.assets[asset])

0 comments on commit f2283d7

Please sign in to comment.