History

Show doc version in search results

Ref #25.

Thibaut Courouble committed 10 years ago

Commit 472d40d1 parent 50154053 files · +31 −17Browse files

Showing the changes to assets/javascripts (2 of 3 files). Show all

Unified · Split

2 files
  1. assets/javascripts/templates/sidebar_tmpl.coffee +7 −6
  2. assets/javascripts/views/sidebar/sidebar_hover.coffee +2 −3
assets/javascripts/templates/sidebar_tmpl.coffee+7−6
@@ -9,22 +9,23 @@ templates.sidebarDoc = (doc, options = {}) -> · 8 unmodified lines
99 else
1010 link += """<span class="_list-arrow"></span>"""
1111 link += """<span class="_list-count">#{doc.release}</span>""" if doc.release
12− link += "#{doc.name}"
12+ link += """<span class="_list-text">#{doc.name}"""
1313 link += " #{doc.version}" if options.disabled and doc.version
14− link + "</a>"
14+ link + "</span></a>"
1515
1616 templates.sidebarType = (type) ->
17− """<a href="#{type.fullPath()}" class="_list-item _list-dir" data-slug="#{type.slug}"><span class="_list-arrow"></span><span class="_list-count">#{type.count}</span>#{type.name}</a>"""
17+ """<a href="#{type.fullPath()}" class="_list-item _list-dir" data-slug="#{type.slug}"><span class="_list-arrow"></span><span class="_list-count">#{type.count}</span><span class="_list-text">#{type.name}</span></a>"""
1818
1919 templates.sidebarEntry = (entry) ->
2020 """<a href="#{entry.fullPath()}" class="_list-item _list-hover">#{$.escape entry.name}</a>"""
2121
2222 templates.sidebarResult = (entry) ->
23− addon = if entry.isIndex() and app.disabledDocs.contains(entry.doc)
23+ addons = if entry.isIndex() and app.disabledDocs.contains(entry.doc)
2424 """<span class="_list-enable" data-enable="#{entry.doc.slug}">Enable</span>"""
2525 else
2626 """<span class="_list-reveal" data-reset-list title="Reveal in list"></span>"""
27− """<a href="#{entry.fullPath()}" class="_list-item _list-hover _list-result _icon-#{entry.doc.icon}">#{addon}#{$.escape entry.name}</a>"""
27+ addons += """<span class="_list-count">#{entry.doc.version}</span>""" if entry.doc.version
28+ """<a href="#{entry.fullPath()}" class="_list-item _list-hover _list-result _icon-#{entry.doc.icon}">#{addons}<span class="_list-text">#{$.escape entry.name}</span></a>"""
2829
2930 templates.sidebarNoResults = ->
3031 html = """ <div class="_list-note">No results.</div> """
@@ -41,7 +42,7 @@ templates.sidebarLabel = (doc, options = {}) -> · 10 unmodified lines
4142 label += " _icon-#{doc.icon}" unless doc.version
4243 label += """"><input type="checkbox" name="#{doc.slug}" class="_list-checkbox" """
4344 label += "checked" if options.checked
44− label + ">#{doc.fullName}</label>"
45+ label + """><span class="_list-text">#{doc.fullName}</span></label>"""
4546
4647 templates.sidebarVersionedDoc = (doc, versions, options = {}) ->
4748 html = """<div class="_list-item _list-dir _list-rdir _icon-#{doc.icon}"""
assets/javascripts/views/sidebar/sidebar_hover.coffee+2−3
@@ -24,7 +24,7 @@ class app.views.SidebarHover extends app.View · 23 unmodified lines
2424 show: (el) ->
2525 unless el is @cursor
2626 @hide()
27− if @isTarget(el) and @isTruncated(el)
27+ if @isTarget(el) and @isTruncated(el.lastElementChild or el)
2828 @cursor = el
2929 @clone = @makeClone @cursor
3030 $.append document.body, @clone
@@ -48,8 +48,7 @@ class app.views.SidebarHover extends app.View · 17 unmodified lines
4848 return
4949
5050 makeClone: (el) ->
51− clone = el.cloneNode()
52− clone.textContent = el.textContent
51+ clone = el.cloneNode(true)
5352 clone.classList.add 'clone'
5453 clone
5554