Show
Ignore:
Timestamp:
13-03-2008 16:35:38 (10 months ago)
Author:
s0undt3ch
Message:

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

Files:
1 modified

Legend:

Unmodified
Added
Removed

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

    r122 r125  
    2828from webhelpers.rails.asset_tag import stylesheet_link_tag as \ 
    2929                                       __stylesheet_link_tag 
     30from webhelpers.rails.asset_tag import compute_public_path 
    3031 
    3132log = logging.getLogger(__name__) 
    … …  
    8586 
    8687    if config.get('debug', False): 
    87         log.debug('Skipping minification/combination; ' 
     88        log.warn('Skipping minification/combination; ' 
    8889                  'Application in debug mode.') 
    8990        return __javascript_include_tag(*sources, **options) 
    9091 
    9192    if options.get('builtins', False): 
    92         log.debug('Skipping minification/combination; ' 
     93        log.warn('Skipping minification/combination; ' 
    9394                  'Requesting builtin javascripts.') 
    9495        return __javascript_include_tag(*sources, **options) 
    9596 
    9697    fs_root = root = config.get('pylons.paths').get('static_files') 
     98    sources = [ 
     99        compute_public_path(source, 'javascripts', 'js') for source in sources 
     100    ] 
    97101    if combined: 
    98         sources = combine_sources([source for source in sources], fs_root) 
     102        sources = combine_sources(sources, fs_root) 
    99103 
    100104    if minified: 
    101         sources = get_sources([source for source in sources], fs_root) 
     105        sources = get_sources(sources, fs_root) 
    102106    return __javascript_include_tag(*sources, **options) 
    103107 
    … …  
    156160 
    157161    if config.get('debug', False): 
    158         log.debug('Skipping minification/combination; ' 
     162        log.warn('Skipping minification/combination; ' 
    159163                  'Application in debug mode.') 
    160164        return __stylesheet_link_tag(*sources, **options) 
    161165 
    162166    fs_root = root = config.get('pylons.paths').get('static_files') 
     167    sources = [ 
     168        compute_public_path(source, 'stylesheets', 'css') for source in sources 
     169    ] 
    163170    if combined: 
    164         sources = combine_sources([source for source in sources], fs_root) 
     171        sources = combine_sources(sources, fs_root) 
    165172 
    166173    if minified: 
    167         sources = get_sources([source for source in sources], fs_root) 
     174        sources = get_sources(sources, fs_root) 
    168175    return __stylesheet_link_tag(*sources, **options) 
    169176