From 437e8d4453ef6bbd641489c72116a27a0e1979cc Mon Sep 17 00:00:00 2001
From: "neil%parkwaycc.co.uk"
 <neil%parkwaycc.co.uk@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 15 Apr 2004 20:32:06 +0000
Subject: [PATCH] Bug 233275 Double-clicking an empty area of the suggested
 word list incorrectly replaces words r=glazou sr=mscott

git-svn-id: svn://10.0.0.236/trunk@154938 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/editor/ui/dialogs/content/EdSpellCheck.js  | 6 ++++--
 mozilla/editor/ui/dialogs/content/EdSpellCheck.xul | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/mozilla/editor/ui/dialogs/content/EdSpellCheck.js b/mozilla/editor/ui/dialogs/content/EdSpellCheck.js
index 3c0bef8f482..6c3acd08a10 100644
--- a/mozilla/editor/ui/dialogs/content/EdSpellCheck.js
+++ b/mozilla/editor/ui/dialogs/content/EdSpellCheck.js
@@ -365,9 +365,11 @@ function IgnoreAll()
   NextWord();
 }
 
-function Replace()
+function Replace(newWord)
 {
-  var newWord = gDialog.ReplaceWordInput.value;
+  if (!newWord)
+    return;
+
   if (gMisspelledWord && gMisspelledWord != newWord)
   {
     var editor = GetCurrentEditor();
diff --git a/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul b/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul
index 9f26ac7d80d..1e1576cb499 100644
--- a/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul
+++ b/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul
@@ -76,13 +76,15 @@
     <rows>
       <row flex="1">
         <!-- BUG! setting class="MinWidth20em" on tree doesn't work (width=0) -->
-        <listbox  rows="6" id="SuggestedList" onselect="SelectSuggestedWord()" ondblclick="Replace();"/>
+        <listbox  rows="6" id="SuggestedList" onselect="SelectSuggestedWord()"
+                  ondblclick="if (gAllowSelectWord) Replace(event.target.getAttribute('label'));"/>
         <vbox>
           <grid flex="1">
             <columns><column class="spell-check" flex="1"/><column class="spell-check" flex="1"/></columns>
             <rows>
               <row>
-                <button id="Replace" oncommand="Replace();" label="&replaceButton.label;"
+                <button id="Replace" label="&replaceButton.label;"
+                        oncommand="Replace(gDialog.ReplaceWordInput.value);"
                         accesskey="&replaceButton.accessKey;"/>
                 <button id="Ignore"  oncommand="Ignore();" label="&ignoreButton.label;"
                         accesskey="&ignoreButton.accessKey;"/>