Add "enable" link to disabled doc entries in search results

Thibaut · Thibaut · commit 96abd6756e31 · 2015-12-07T08:06:19.000-05:00
diff --git a/assets/javascripts/templates/sidebar_tmpl.coffee b/assets/javascripts/templates/sidebar_tmpl.coffee
@@ -18,7 +18,11 @@ templates.sidebarEntry = (entry) ->
   """<a href="#{entry.fullPath()}" class="_list-item _list-hover">#{$.escape entry.name}</a>"""
 
 templates.sidebarResult = (entry) ->
-  """<a href="#{entry.fullPath()}" class="_list-item _list-hover _list-result _icon-#{entry.doc.slug}"><span class="_list-reveal" data-reset-list title="Reveal in list"></span>#{$.escape entry.name}</a>"""
+  addon = if entry.isIndex() and app.disabledDocs.contains(entry.doc)
+    """<span class="_list-enable" data-enable="#{entry.doc.slug}">Enable</span>"""
+  else
+    """<span class="_list-reveal" data-reset-list title="Reveal in list"></span>"""
+  """<a href="#{entry.fullPath()}" class="_list-item _list-hover _list-result _icon-#{entry.doc.slug}">#{addon}#{$.escape entry.name}</a>"""
 
 templates.sidebarNoResults = ->
   html = """ <div class="_list-note">No results.</div> """
diff --git a/assets/javascripts/views/sidebar/doc_list.coffee b/assets/javascripts/views/sidebar/doc_list.coffee
@@ -142,10 +142,10 @@ class app.views.DocList extends app.View
     else if slug = event.target.getAttribute('data-enable')
       $.stopEvent(event)
       doc = app.disabledDocs.findBy('slug', slug)
-      app.enableDoc(doc, @onEnable, @onEnable)
+      app.enableDoc(doc, @onEnabled, @onEnabled)
     return
 
-  onEnable: =>
+  onEnabled: =>
     @reset()
     @render()
     return
diff --git a/assets/javascripts/views/sidebar/results.coffee b/assets/javascripts/views/sidebar/results.coffee
@@ -1,10 +1,13 @@
 class app.views.Results extends app.View
   @className: '_list'
 
+  @events:
+    click: 'onClick'
+
   @routes:
     after: 'afterRoute'
 
-  constructor: (@search) -> super
+  constructor: (@sidebar, @search) -> super
 
   deactivate: ->
     if super
@@ -46,9 +49,20 @@ class app.views.Results extends app.View
     @el.firstElementChild?.click()
     return
 
+  onDocEnabled: (doc) ->
+    app.router.show(doc.fullPath())
+    @sidebar.onDocEnabled()
+
   afterRoute: (route, context) =>
     if route is 'entry'
       @listSelect.selectByHref context.entry.fullPath()
     else
       @listSelect.deselect()
     return
+
+  onClick: (event) =>
+    return if event.which isnt 1
+    if slug = event.target.getAttribute('data-enable')
+      $.stopEvent(event)
+      doc = app.disabledDocs.findBy('slug', slug)
+      app.enableDoc(doc, @onDocEnabled.bind(@, doc), $.noop)
diff --git a/assets/javascripts/views/sidebar/sidebar.coffee b/assets/javascripts/views/sidebar/sidebar.coffee
@@ -17,7 +17,7 @@ class app.views.Sidebar extends app.View
       .on 'searching', @showResults
       .on 'clear', @showDocList
 
-    @results = new app.views.Results @search
+    @results = new app.views.Results @, @search
     @docList = new app.views.DocList
     @docPicker = new app.views.DocPicker unless app.isSingleDoc()
 
@@ -105,3 +105,7 @@ class app.views.Sidebar extends app.View
     @reset()
     @scrollToTop()
     return
+
+  onDocEnabled: ->
+    @docList.onEnabled()
+    @reset()
diff --git a/assets/stylesheets/components/_sidebar.scss b/assets/stylesheets/components/_sidebar.scss
@@ -143,7 +143,7 @@
   cursor: pointer;
 
   &:hover { text-decoration: underline; }
-  ._list-disabled:hover > & { display: block; }
+  ._list-disabled:hover > &, ._list-result > & { display: block; }
 }
 
 //

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@`
`143`	`143`	`cursor: pointer;`
`144`	`144`
`145`	`145`	`&:hover { text-decoration: underline; }`
`146`		`- ._list-disabled:hover > & { display: block; }`
	`146`	`+ ._list-disabled:hover > &, ._list-result > & { display: block; }`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`//`