From dcca46cd0f50a795d8ac09fc20848f69184f1095 Mon Sep 17 00:00:00 2001
From: Thibaut Courouble <thibaut@me.com>
Date: Sat, 22 Apr 2017 08:48:53 -0400
Subject: [PATCH] Fix race-condition when auto-opening first search result

Fixes #604.
---
 assets/javascripts/views/content/entry_page.coffee | 6 +++---
 assets/javascripts/views/sidebar/results.coffee    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/assets/javascripts/views/content/entry_page.coffee b/assets/javascripts/views/content/entry_page.coffee
index 92ef80fb..64c5155a 100644
--- a/assets/javascripts/views/content/entry_page.coffee
+++ b/assets/javascripts/views/content/entry_page.coffee
@@ -89,8 +89,8 @@ class app.views.EntryPage extends app.View
     @entry.doc.fullName + if @entry.isIndex() then ' documentation' else " / #{@entry.name}"
 
   beforeRoute: =>
-    @abort()
     @cache()
+    @abort()
     return
 
   onRoute: (context) ->
@@ -107,7 +107,7 @@ class app.views.EntryPage extends app.View
   abort: ->
     if @xhr
       @xhr.abort()
-      @xhr = null
+      @xhr = @entry = null
     return
 
   onSuccess: (response) =>
@@ -125,7 +125,7 @@ class app.views.EntryPage extends app.View
     return
 
   cache: ->
-    return if not @entry or @cacheMap[path = @entry.filePath()]
+    return if @xhr or not @entry or @cacheMap[path = @entry.filePath()]
 
     @cacheMap[path] = @el.innerHTML
     @cacheStack.push(path)
diff --git a/assets/javascripts/views/sidebar/results.coffee b/assets/javascripts/views/sidebar/results.coffee
index f5bed318..0793c452 100644
--- a/assets/javascripts/views/sidebar/results.coffee
+++ b/assets/javascripts/views/sidebar/results.coffee
@@ -46,7 +46,7 @@ class app.views.Results extends app.View
     return
 
   openFirst: ->
-    setTimeout (=> @el.firstElementChild?.click()), 0
+    @el.firstElementChild?.click()
     return
 
   onDocEnabled: (doc) ->