Changeset 125

Timestamp:

13-03-2008 16:35:38 (5 months ago)

Author:

s0undt3ch

Message:

Path files are now computed with the help of Pylons compute_public_path. Hopefully fixes #1.

Files:

• sandbox/MinificationWebHelpers/tags/0.1.2/minwebhelpers/asset_tag.py (modified) (3 diffs)

sandbox/MinificationWebHelpers/tags/0.1.2/minwebhelpers/asset_tag.py

@@ -28 +28 @@
 from webhelpers.rails.asset_tag import stylesheet_link_tag as \
                                        __stylesheet_link_tag
+from webhelpers.rails.asset_tag import compute_public_path
 
 log = logging.getLogger(__name__)
@@ -85 +86 @@
 
     if config.get('debug', False):
-        log.debug('Skipping minification/combination; '
+        log.warn('Skipping minification/combination; '
                   'Application in debug mode.')
         return __javascript_include_tag(*sources, **options)
 
     if options.get('builtins', False):
-        log.debug('Skipping minification/combination; '
+        log.warn('Skipping minification/combination; '
                   'Requesting builtin javascripts.')
         return __javascript_include_tag(*sources, **options)
 
     fs_root = root = config.get('pylons.paths').get('static_files')
+    sources = [
+        compute_public_path(source, 'javascripts', 'js') for source in sources
+    ]
     if combined:
-        sources = combine_sources([source for source in sources], fs_root)
+        sources = combine_sources(sources, fs_root)
 
     if minified:
-        sources = get_sources([source for source in sources], fs_root)
+        sources = get_sources(sources, fs_root)
     return __javascript_include_tag(*sources, **options)
 
@@ -156 +160 @@
 
     if config.get('debug', False):
-        log.debug('Skipping minification/combination; '
+        log.warn('Skipping minification/combination; '
                   'Application in debug mode.')
         return __stylesheet_link_tag(*sources, **options)
 
     fs_root = root = config.get('pylons.paths').get('static_files')
+    sources = [
+        compute_public_path(source, 'stylesheets', 'css') for source in sources
+    ]
     if combined:
-        sources = combine_sources([source for source in sources], fs_root)
+        sources = combine_sources(sources, fs_root)
 
     if minified:
-        sources = get_sources([source for source in sources], fs_root)
+        sources = get_sources(sources, fs_root)
     return __stylesheet_link_tag(*sources, **options)