From 57a7c5fa3316211e41cf6b7b00c00e508c73630e Mon Sep 17 00:00:00 2001
From: "jfrancis%netscape.com"
 <jfrancis%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 12 Jul 2000 23:21:49 +0000
Subject: [PATCH] fix for 43903; making a list after inline contnet doesnt work

git-svn-id: svn://10.0.0.236/trunk@74125 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/editor/base/nsHTMLEditRules.cpp         | 17 +++++++++--------
 .../editor/libeditor/html/nsHTMLEditRules.cpp   | 17 +++++++++--------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/mozilla/editor/base/nsHTMLEditRules.cpp b/mozilla/editor/base/nsHTMLEditRules.cpp
index 36d880cabdb..0677470009e 100644
--- a/mozilla/editor/base/nsHTMLEditRules.cpp
+++ b/mozilla/editor/base/nsHTMLEditRules.cpp
@@ -3729,14 +3729,6 @@ nsHTMLEditRules::ShouldMakeEmptyBlock(nsIDOMSelection *aSelection,
       }
     }
     
-    // are we in a textnode or inline node?
-    if (!nsEditor::IsBlockNode(parent))
-    {
-      // we must be in a text or inline node - convert existing block
-      *outMakeEmpty = PR_FALSE;
-      return res;
-    }
-        
     // is it after a <br> with no inline nodes after it, or a <br> after it??
     if (offset)
     {
@@ -3771,6 +3763,15 @@ nsHTMLEditRules::ShouldMakeEmptyBlock(nsIDOMSelection *aSelection,
         }
       }
     }
+
+    // are we in a textnode or inline node?
+    if (!nsEditor::IsBlockNode(parent))
+    {
+      // we must be in a text or inline node - convert existing block
+      *outMakeEmpty = PR_FALSE;
+      return res;
+    }
+        
   }    
   // otherwise transform an existing block
   *outMakeEmpty = PR_FALSE;
diff --git a/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp b/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp
index 36d880cabdb..0677470009e 100644
--- a/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp
+++ b/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp
@@ -3729,14 +3729,6 @@ nsHTMLEditRules::ShouldMakeEmptyBlock(nsIDOMSelection *aSelection,
       }
     }
     
-    // are we in a textnode or inline node?
-    if (!nsEditor::IsBlockNode(parent))
-    {
-      // we must be in a text or inline node - convert existing block
-      *outMakeEmpty = PR_FALSE;
-      return res;
-    }
-        
     // is it after a <br> with no inline nodes after it, or a <br> after it??
     if (offset)
     {
@@ -3771,6 +3763,15 @@ nsHTMLEditRules::ShouldMakeEmptyBlock(nsIDOMSelection *aSelection,
         }
       }
     }
+
+    // are we in a textnode or inline node?
+    if (!nsEditor::IsBlockNode(parent))
+    {
+      // we must be in a text or inline node - convert existing block
+      *outMakeEmpty = PR_FALSE;
+      return res;
+    }
+        
   }    
   // otherwise transform an existing block
   *outMakeEmpty = PR_FALSE;