deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixes #1780

Browse source
This commit is contained in:
Thomas Reynolds 2016-01-26 13:47:27 -08:00
parent 0c29fd4abf
commit 2bba7888b0
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -21,6 +21,7 @@ master
* Correctly show file names of GZIP'ed assets. #1364 * Correctly show file names of GZIP'ed assets. #1364
* Build file output is not parallel-ized! Use `middleman build --no-parallel` to disable. * Build file output is not parallel-ized! Use `middleman build --no-parallel` to disable.
* Make template file extensions that get layouts by default configurable via `config[:extensions_with_layout]` * Make template file extensions that get layouts by default configurable via `config[:extensions_with_layout]`
* Remove `=` from inline url matcher. This means paths in HTML attributes MUST be quoted. Fixes #1780
# 4.0.0 # 4.0.0

2
middleman-core/features/asset_host.feature
View file

@ -17,6 +17,8 @@ Feature: Alternate between multiple asset hosts
When I go to "/stylesheets/asset_host.css" When I go to "/stylesheets/asset_host.css"
Then I should see content matching %r{http://assets1.example.com/} Then I should see content matching %r{http://assets1.example.com/}
Then I should not see content matching %r{http://assets1.example.com//} Then I should not see content matching %r{http://assets1.example.com//}
When I go to "/javascripts/asset_host.js"
Then I should not see content matching %r{http://assets1.example.com/}
Scenario: Set proc host with inline-option Scenario: Set proc host with inline-option
Given a fixture app "asset-host-app" Given a fixture app "asset-host-app"

2
middleman-core/lib/middleman-core/util.rb
View file

@ -341,7 +341,7 @@ module Middleman
Contract String, String, ArrayOf[String], Proc => String Contract String, String, ArrayOf[String], Proc => String
def rewrite_paths(body, _path, exts, &_block) def rewrite_paths(body, _path, exts, &_block)
matcher = /([=\'\"\(,]\s*)([^\s\'\"\)>]+(#{Regexp.union(exts)}))/ matcher = /([\'\"\(,]\s*)([^\s\'\"\)>]+(#{Regexp.union(exts)}))/
url_fn_prefix = 'url(' url_fn_prefix = 'url('