From 991e54288886a9706d121ddaf9eac3c1fdc49ac4 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 30 Dec 2019 02:29:58 -0500
Subject: [PATCH] Fix broken autocomplete popup when editing a saved search

https://forums.zotero.org/discussion/comment/345646/#Comment_345646

This is probably the actual fix for what I was trying to fix in
360f034b5, and I couldn't reproduce it because it was about saved
searches.
---
 chrome/content/zotero/bindings/zoterosearch.xml | 6 ++++++
 components/zotero-autocomplete.js               | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/chrome/content/zotero/bindings/zoterosearch.xml b/chrome/content/zotero/bindings/zoterosearch.xml
index 7cd71a4d3f..fc9231e885 100644
--- a/chrome/content/zotero/bindings/zoterosearch.xml
+++ b/chrome/content/zotero/bindings/zoterosearch.xml
@@ -41,6 +41,12 @@
 		</resources>
 		
 		<implementation>
+			<constructor>
+			<![CDATA[
+				Components.utils.import("resource://gre/modules/Services.jsm");
+			]]>
+			</constructor>
+			
 			<property name="groups"/>
 			
 			<field name="searchRef"/>
diff --git a/components/zotero-autocomplete.js b/components/zotero-autocomplete.js
index 9082cf4abd..f376cbed65 100644
--- a/components/zotero-autocomplete.js
+++ b/components/zotero-autocomplete.js
@@ -32,7 +32,6 @@ const Ci = Components.interfaces;
 const Cr = Components.results;
 
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-Components.utils.import("resource://gre/modules/Services.jsm");
 
 var Zotero = Components.classes["@zotero.org/Zotero;1"]
 	.getService(Components.interfaces.nsISupports)