fixed issue 583 (minify error with None)
This commit is contained in:
@@ -1 +1 @@
|
||||
Version 1.99.4 (2011-12-31 11:47:41) stable
|
||||
Version 1.99.4 (2011-12-31 11:54:12) stable
|
||||
|
||||
@@ -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
|
||||
- ('css:inline','...css..')
|
||||
- ('js:inline','...js..')
|
||||
"""
|
||||
"""
|
||||
optimize_css = optimize_css or ''
|
||||
optimize_js = optimize_js or ''
|
||||
concat_css = 'concat' in optimize_css
|
||||
minify_css = 'minify' in optimize_css
|
||||
inline_css = 'inline' in optimize_css
|
||||
|
||||
+6
-3
@@ -233,12 +233,15 @@ class Response(Storage):
|
||||
# cache for 5 minutes by default
|
||||
cache = self.cache_includes or (current.cache.ram, 60*5)
|
||||
def call_minify():
|
||||
return minify.minify(files,URL('static','temp'),
|
||||
return minify.minify(files,
|
||||
URL('static','temp'),
|
||||
current.request.folder,
|
||||
self.optimize_css,self.optimize_js)
|
||||
self.optimize_css,
|
||||
self.optimize_js)
|
||||
if cache:
|
||||
cache_model, time_expire = cache
|
||||
files = cache_model('response.files.minified',call_minify,
|
||||
files = cache_model('response.files.minified',
|
||||
call_minify,
|
||||
time_expire)
|
||||
else:
|
||||
files = call_minify()
|
||||
|
||||
Reference in New Issue
Block a user