dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed issue 583 (minify error with None)

Browse Source
This commit is contained in:
Massimo Di Pierro
2011-12-31 11:54:35 -06:00
parent 31f6c88b9d
commit 2650774230
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 1.99.4 (2011-12-31 11:47:41) stable Version 1.99.4 (2011-12-31 11:54:12) stable
gluon/contrib/minify/minify.py
+3 -1
View File
@@ -43,7 +43,9 @@ def minify(files, path_info, folder, optimize_css, optimize_js,
- filename (absolute or relative, css or js, actual or temporary) or - filename (absolute or relative, css or js, actual or temporary) or
- ('css:inline','...css..') - ('css:inline','...css..')
- ('js:inline','...js..') - ('js:inline','...js..')
""" """
optimize_css = optimize_css or ''
optimize_js = optimize_js or ''
concat_css = 'concat' in optimize_css concat_css = 'concat' in optimize_css
minify_css = 'minify' in optimize_css minify_css = 'minify' in optimize_css
inline_css = 'inline' in optimize_css inline_css = 'inline' in optimize_css
gluon/globals.py
+6 -3
View File
@@ -233,12 +233,15 @@ class Response(Storage):
# cache for 5 minutes by default # cache for 5 minutes by default
cache = self.cache_includes or (current.cache.ram, 60*5) cache = self.cache_includes or (current.cache.ram, 60*5)
def call_minify(): def call_minify():
return minify.minify(files,URL('static','temp'), return minify.minify(files,
URL('static','temp'),
current.request.folder, current.request.folder,
self.optimize_css,self.optimize_js) self.optimize_css,
self.optimize_js)
if cache: if cache:
cache_model, time_expire = cache cache_model, time_expire = cache
files = cache_model('response.files.minified',call_minify, files = cache_model('response.files.minified',
call_minify,
time_expire) time_expire)
else: else:
files = call_minify() files = call_minify()