From 692d20e822f0f31b3764e3d6cdd481fcca8d03a0 Mon Sep 17 00:00:00 2001
From: Mounir Lamouri <mounir.lamouri@gmail.com>
Date: Sun, 24 Oct 2010 15:32:58 +0200
Subject: [PATCH] Bug 606663 - Invalid form popup shouldn't create a text node
 but use a <description/>. r+a=gavin.sharp

---
 browser/base/content/browser.js  | 3 +--
 browser/base/content/browser.xul | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index e79b41f881d8..6d6c00d73cb2 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -787,7 +787,6 @@ const gFormSubmitObserver = {
   init: function()
   {
     this.panel = document.getElementById('invalid-form-popup');
-    this.panel.appendChild(document.createTextNode(""));
   },
 
   panelIsOpen: function()
@@ -821,7 +820,7 @@ const gFormSubmitObserver = {
     }
 
     // Limit the message to 256 characters.
-    this.panel.firstChild.nodeValue = element.validationMessage.substring(0, 256);
+    this.panel.firstChild.textContent = element.validationMessage.substring(0, 256);
 
     element.focus();
 
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 3af7dfb13c76..5dfe1b5586e0 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -167,7 +167,9 @@
     <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/>
 
     <!-- for invalid form error message -->
-    <panel id="invalid-form-popup" noautofocus="true" hidden="true" level="parent"/>
+    <panel id="invalid-form-popup" noautofocus="true" hidden="true" level="parent">
+      <description/>
+    </panel>
 
     <panel id="editBookmarkPanel"
            orient="vertical"