Fixes #440.
Unified · Split
| @@ -39,7 +39,6 @@ module Docs · 38 unmodified lines | |||
| 39 | def to_internal_url(str) | 39 | def to_internal_url(str) |
| 40 | return unless (url = parse_url(str)) && (subpath = subpath_to(url)) | 40 | return unless (url = parse_url(str)) && (subpath = subpath_to(url)) |
| 41 | normalize_subpath(subpath) | 41 | normalize_subpath(subpath) |
| 42 | subpath = URI.unescape(subpath) if context[:decode_and_clean_paths] | ||
| 43 | return if skip_subpath?(subpath) | 42 | return if skip_subpath?(subpath) |
| 44 | normalize_url(url, subpath) | 43 | normalize_url(url, subpath) |
| 45 | url | 44 | url |
| @@ -22,10 +22,10 @@ module Docs · 21 unmodified lines | |||
| 22 | options[:fix_urls] = ->(url) do | 22 | options[:fix_urls] = ->(url) do |
| 23 | %w(api guide).each do |str| | 23 | %w(api guide).each do |str| |
| 24 | url.sub! "/partials/#{str}/#{str}/", "/partials/#{str}/" | 24 | url.sub! "/partials/#{str}/#{str}/", "/partials/#{str}/" |
| 25 | url.sub! %r{/#{str}/img/}, "/img/" | 25 | url.sub! %r{/#{str}/img/}, '/img/' |
| 26 | url.sub! %r{/#{str}/(.+?)/#{str}/}, "/#{str}/" | 26 | url.sub! %r{/#{str}/(.+?)/#{str}/}, "/#{str}/" |
| 27 | url.sub! %r{/partials/#{str}/(.+?)(?<!\.html)(?:\z|(#.*))}, "/partials/#{str}/\\1.html\\2" | 27 | url.sub! %r{/partials/#{str}/(.+?)(?<!\.html)(?:\z|(#.*))}, "/partials/#{str}/\\1.html\\2" |
| 28 | url.sub! %r{/partials/.+/#{str}/}, "/partials/#{str}/" | 28 | url.sub! %r{/partials/(?!img).+/#{str}/}, "/partials/#{str}/" |
| 29 | end | 29 | end |
| 30 | url | 30 | url |
| 31 | end | 31 | end |
| @@ -46,7 +46,7 @@ module Docs · 14 unmodified lines | |||
| 46 | end | 46 | end |
| 47 | 47 | ||
| 48 | version '1.5' do | 48 | version '1.5' do |
| 49 | self.release = '1.5.7' | 49 | self.release = '1.5.8' |
| 50 | self.base_url = "https://code.angularjs.org/#{release}/docs/partials/" | 50 | self.base_url = "https://code.angularjs.org/#{release}/docs/partials/" |
| 51 | end | 51 | end |
| 52 | 52 | ||
| @@ -61,7 +61,7 @@ module Docs · 8 unmodified lines | |||
| 61 | end | 61 | end |
| 62 | 62 | ||
| 63 | version '1.2' do | 63 | version '1.2' do |
| 64 | self.release = '1.2.29' | 64 | self.release = '1.2.30' |
| 65 | self.base_url = "https://code.angularjs.org/#{release}/docs/partials/" | 65 | self.base_url = "https://code.angularjs.org/#{release}/docs/partials/" |
| 66 | end | 66 | end |
| 67 | end | 67 | end |