From: Alexander Butenko <a.butenka@gmail.com>
Date: Wed, 30 Jun 2010 13:51:54 +0000 (-0400)
Subject: Don't inject autosuggest bits where we dont need it
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=896cc75f5771693f9f39fdffdcf37b518abd01a6;p=midori

Don't inject autosuggest bits where we dont need it
---

diff --git a/data/autosuggestcontrol.js b/data/autosuggestcontrol.js
index f045f0f5..85a506ab 100644
--- a/data/autosuggestcontrol.js
+++ b/data/autosuggestcontrol.js
@@ -295,7 +295,9 @@ FormSuggestions.prototype.requestSuggestions = function (oAutoSuggestControl /*:
 };
 
 function initSuggestions () {
-    var inputs = document.getElementsByTagName("input");
+    var inputs = document.getElementsByTagName ("input");
+    if (inputs.length == 0)
+        return false;
 
     for (i=0;i<inputs.length;i++)
     {
@@ -308,4 +310,5 @@ function initSuggestions () {
         if (inputs[i].type == "text" && autocomplete != "off")
             var smth = new AutoSuggestControl (inputs[i], new FormSuggestions (ename));
     }
+    return true;
 };
diff --git a/extensions/formhistory.c b/extensions/formhistory.c
index f0790af8..b772ef04 100644
--- a/extensions/formhistory.c
+++ b/extensions/formhistory.c
@@ -64,7 +64,8 @@ formhistory_prepare_js ()
         "function () {"
         "   if (document.getElementById('formhistory'))"
         "       return;"
-        "   initSuggestions ();"
+        "   if (!initSuggestions ())"
+        "       return;"
         "   var mystyle = document.createElement('style');"
         "   mystyle.setAttribute('type', 'text/css');"
         "   mystyle.setAttribute('id', 'formhistory');"