Fix search aliases not applying properly on versioned docs

Fixes #461.

Thibaut Courouble committed 10 years ago

Commit c63be681 parent fd562622 files · +13 −4Browse files

Unified · Split

2 files

     "#{app.indexHost()}/#{@slug}/#{app.config.index_filename}?#{@mtime}"
   toEntry: ->
-    @entry ||= new app.models.Entry
+    return @entry if @entry
+    @entry = new app.models.Entry
       doc: @
       name: @fullName
       path: 'index'
+    @entry.addAlias(@name) if @version
+    @entry
   findEntryByPathAndHash: (path, hash) ->
     if hash and entry = @entries.findBy 'path', "#{path}##{hash}"

@@ -5,8 +5,13 @@ class app.models.Entry extends app.Model · 4 unmodified lines
5		5
6	constructor: ->	6	constructor: ->
7	super	7	super
8	@text = app.Searcher.normalizeString(@name)	8	@text = applyAliases(app.Searcher.normalizeString(@name))
9	@text = applyAliases(@text)	9
		10	addAlias: (name) ->
		11	text = applyAliases(app.Searcher.normalizeString(name))
		12	@text = [@text] unless Array.isArray(@text)
		13	@text.push(if Array.isArray(text) then text[1] else text)
		14	return
10		15
11	fullPath: ->	16	fullPath: ->
12	@doc.fullPath if @isIndex() then '' else @path	17	@doc.fullPath if @isIndex() then '' else @path
@@ -45,8 +50,9 @@ class app.models.Entry extends app.Model · 32 unmodified lines
45	return string	50	return string
46		51
47	@ALIASES = ALIASES =	52	@ALIASES = ALIASES =
		53	'angular': 'ng'
48	'angular.js': 'ng'	54	'angular.js': 'ng'
49	'backbone': 'bb'	55	'backbone.js': 'bb'
50	'c++': 'cpp'	56	'c++': 'cpp'
51	'coffeescript': 'cs'	57	'coffeescript': 'cs'
52	'elixir': 'ex'	58	'elixir': 'ex'

Keyboard shortcuts