History

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
  1. assets/javascripts/models/doc.coffee +4 −1
  2. assets/javascripts/models/entry.coffee +9 −3
assets/javascripts/models/doc.coffee+4−1
@@ -39,10 +39,13 @@ class app.models.Doc extends app.Model · 38 unmodified lines
3939 "#{app.indexHost()}/#{@slug}/#{app.config.index_filename}?#{@mtime}"
4040
4141 toEntry: ->
42− @entry ||= new app.models.Entry
42+ return @entry if @entry
43+ @entry = new app.models.Entry
4344 doc: @
4445 name: @fullName
4546 path: 'index'
47+ @entry.addAlias(@name) if @version
48+ @entry
4649
4750 findEntryByPathAndHash: (path, hash) ->
4851 if hash and entry = @entries.findBy 'path', "#{path}##{hash}"
assets/javascripts/models/entry.coffee+9−3
@@ -5,8 +5,13 @@ class app.models.Entry extends app.Model · 4 unmodified lines
55
66 constructor: ->
77 super
8− @text = app.Searcher.normalizeString(@name)
9− @text = applyAliases(@text)
8+ @text = applyAliases(app.Searcher.normalizeString(@name))
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
1015
1116 fullPath: ->
1217 @doc.fullPath if @isIndex() then '' else @path
@@ -45,8 +50,9 @@ class app.models.Entry extends app.Model · 32 unmodified lines
4550 return string
4651
4752 @ALIASES = ALIASES =
53+ 'angular': 'ng'
4854 'angular.js': 'ng'
49− 'backbone': 'bb'
55+ 'backbone.js': 'bb'
5056 'c++': 'cpp'
5157 'coffeescript': 'cs'
5258 'elixir': 'ex'

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t