4 files changed, 11 insertions, 19 deletions
diff --git a/extensions/BMO/template/en/default/global/choose-product.html.tmpl b/extensions/BMO/template/en/default/global/choose-product.html.tmpl
index d0d115621..6eec58065 100644
--- a/extensions/BMO/template/en/default/global/choose-product.html.tmpl
+++ b/extensions/BMO/template/en/default/global/choose-product.html.tmpl
@@ -66,7 +66,9 @@
 <div id="prod_comp_search_main">
   <div id="prod_comp_search_autocomplete">
     <div id="prod_comp_search_label">
-      Type to find product and component by name or description
+      Type to find product and component by name or description:
+      <img id="prod_comp_throbber" src="extensions/BMO/web/images/throbber.gif"
+           class="hidden" width="16" height="11">
     </div>
     <input id="prod_comp_search" type="text" size="60">
     <div id="prod_comp_search_autocomplete_container"></div>
diff --git a/extensions/BMO/web/js/choose_product.js b/extensions/BMO/web/js/choose_product.js
index 507d1458b..6fe980971 100644
--- a/extensions/BMO/web/js/choose_product.js
+++ b/extensions/BMO/web/js/choose_product.js
@@ -21,6 +21,7 @@ YAHOO.bugzilla.prodCompSearch = {
             search : decodeURIComponent(enteredText)
           } ]
       };
+      YAHOO.util.Dom.removeClass('prod_comp_throbber', 'hidden');
       return YAHOO.lang.JSON.stringify(json_object);
     },
     resultListFormat : function(oResultData, enteredText, sResultMatch) {
@@ -60,6 +61,10 @@ YAHOO.bugzilla.prodCompSearch = {
         this.autoComplete.useIFrame = true;
         this.autoComplete.maxResultsDisplayed = 25;
         this.autoComplete.suppressInputUpdate = true;
+        this.autoComplete.doBeforeLoadData = function(sQuery, oResponse, oPayload) {
+            YAHOO.util.Dom.addClass('prod_comp_throbber', 'hidden');
+            return true;
+        };
         this.autoComplete.textboxFocusEvent.subscribe(function () {
             var input = YAHOO.util.Dom.get(field);
             if (input.value && input.value.length > 3) {
diff --git a/extensions/BMO/web/styles/choose_product.css b/extensions/BMO/web/styles/choose_product.css
index 5d4da73ec..06ff0f85c 100644
--- a/extensions/BMO/web/styles/choose_product.css
+++ b/extensions/BMO/web/styles/choose_product.css
@@ -21,8 +21,8 @@
     margin-left: auto;
 }
 
-#prod_comp_search_label {
-    text-align: center;
+#prod_comp_search_main .hidden {
+    display: none;
 }
 
 #prod_comp_search_main li.yui-ac-highlight a {
diff --git a/extensions/GuidedBugEntry/web/js/guided.js b/extensions/GuidedBugEntry/web/js/guided.js
index 16f1d4952..9e7f19d67 100644
--- a/extensions/GuidedBugEntry/web/js/guided.js
+++ b/extensions/GuidedBugEntry/web/js/guided.js
@@ -98,22 +98,7 @@ var product = {
   _loaded: '',
   _preselectedComponent: '',
 
-  onInit: function() {
-    // BMO only
-    if (YAHOO.bugzilla.prodCompSearch.autoComplete) {
-      // show a throbber while searching for products
-      var autoComplete = YAHOO.bugzilla.prodCompSearch.autoComplete;
-      var orig_generateRequest = autoComplete.generateRequest;
-      autoComplete.generateRequest = function(sQuery) {
-        Dom.removeClass('prod_comp_throbber', 'hidden');
-        return orig_generateRequest(sQuery);
-      };
-      autoComplete.doBeforeLoadData = function(sQuery, oResponse, oPayload) {
-        Dom.addClass('prod_comp_throbber', 'hidden');
-        return true;
-      };
-    }
-  },
+  onInit: function() { },
 
   onShow: function() {
     Dom.removeClass('advanced', 'hidden');