From 569f5701ee410b3f6da7e005e7277d1add467d44 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Mon, 11 Jan 2016 11:06:00 +0100
Subject: Only load autocomplete data when actually needed

Previously this would result in autocomplete data being loaded for every
page (e.g. the page showing all Git branches of a project).
---
 app/assets/javascripts/gfm_auto_complete.js.coffee | 19 ++++++++++---------
 app/views/layouts/_init_auto_complete.html.haml    |  8 +++++---
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/gfm_auto_complete.js.coffee b/app/assets/javascripts/gfm_auto_complete.js.coffee
index fa90fb65f42..4718bcf7a1e 100644
--- a/app/assets/javascripts/gfm_auto_complete.js.coffee
+++ b/app/assets/javascripts/gfm_auto_complete.js.coffee
@@ -68,12 +68,13 @@ GitLab.GfmAutoComplete =
             title:  sanitize(m.title)
             search: "#{m.iid} #{m.title}"
 
-    $.getJSON(@dataSource).done (data) ->
-      # load members
-      input.atwho 'load', '@', data.members
-      # load issues
-      input.atwho 'load', 'issues', data.issues
-      # load merge requests
-      input.atwho 'load', 'mergerequests', data.mergerequests
-      # load emojis
-      input.atwho 'load', ':', data.emojis
+    if @dataSource
+      $.getJSON(@dataSource).done (data) ->
+        # load members
+        input.atwho 'load', '@', data.members
+        # load issues
+        input.atwho 'load', 'issues', data.issues
+        # load merge requests
+        input.atwho 'load', 'mergerequests', data.mergerequests
+        # load emojis
+        input.atwho 'load', ':', data.emojis
diff --git a/app/views/layouts/_init_auto_complete.html.haml b/app/views/layouts/_init_auto_complete.html.haml
index 035fe0056d3..96b38485425 100644
--- a/app/views/layouts/_init_auto_complete.html.haml
+++ b/app/views/layouts/_init_auto_complete.html.haml
@@ -1,4 +1,6 @@
 - project = @target_project || @project
-:javascript
-  GitLab.GfmAutoComplete.dataSource = "#{autocomplete_sources_namespace_project_path(project.namespace, project, type: @noteable.class, type_id: params[:id])}"
-  GitLab.GfmAutoComplete.setup();
+
+- if @noteable
+  :javascript
+    GitLab.GfmAutoComplete.dataSource = "#{autocomplete_sources_namespace_project_path(project.namespace, project, type: @noteable.class, type_id: params[:id])}"
+    GitLab.GfmAutoComplete.setup();
-- 
cgit v1.2.1