History

Fix sidebar issue when docs are enabled inline

Thibaut committed 11 years ago

Commit b135f8c1 parent ee4509f2 files · +16 −8Browse files

Unified · Split

2 files
  1. assets/javascripts/views/sidebar/doc_list.coffee +15 −7
  2. assets/javascripts/views/sidebar/sidebar.coffee +1 −1
assets/javascripts/views/sidebar/doc_list.coffee+15−7
@@ -65,14 +65,11 @@ class app.views.DocList extends app.View · 64 unmodified lines
6565 @refreshElements()
6666 return
6767
68− reset: ->
68+ reset: (options = {}) ->
6969 @listSelect.deselect()
7070 @listFocus?.blur()
7171 @listFold.reset()
72−
73− if model = app.router.context.type or app.router.context.entry
74− @reveal model
75− @select model
72+ @revealCurrent() if options.revealCurrent
7673 return
7774
7875 onOpen: (event) =>
@@ -107,6 +104,12 @@ class app.views.DocList extends app.View · 28 unmodified lines
107104 @scrollTo model
108105 return
109106
107+ revealCurrent: ->
108+ if model = app.router.context.type or app.router.context.entry
109+ @reveal model
110+ @select model
111+ return
112+
110113 openDoc: (doc) ->
111114 @listFold.open @find("[data-slug='#{doc.slug}']")
112115 return
@@ -139,12 +142,17 @@ class app.views.DocList extends app.View · 26 unmodified lines
139142 else if slug = event.target.getAttribute('data-enable')
140143 $.stopEvent(event)
141144 doc = app.disabledDocs.findBy('slug', slug)
142− app.enableDoc(doc, @render, @render)
145+ app.enableDoc(doc, @onEnable, @onEnable)
146+ return
147+
148+ onEnable: =>
149+ @reset()
150+ @render()
143151 return
144152
145153 afterRoute: (route, context) =>
146154 if context.init
147− @reset()
155+ @reset revealCurrent: true
148156 else
149157 @select context.type or context.entry
150158 return
assets/javascripts/views/sidebar/sidebar.coffee+1−1
@@ -39,7 +39,7 @@ class app.views.Sidebar extends app.View · 38 unmodified lines
3939 showDocList: (reset) =>
4040 @show @docList
4141 if reset is true
42− @docList.reset()
42+ @docList.reset(revealCurrent: true)
4343 @search.reset()
4444 return
4545