Attachment 471667 Details for Bug 590640

[patch] WIP 1: works for list insertions

590640.patch (text/plain), 3.66 KB, created by (no longer active)

(hide)

Description:

Filename:

MIME Type:

Creator: (no longer active)

Size: 3.66 KB

patch

obsolete

># HG changeset patch
># Parent bfcf7fd38c932ab4b114af8426bb2ad70a7818c2
># User Ehsan Akhgari <ehsan@mozilla.com>
>Bug 590640 - Editor loses type-in state when injecting some elements
>
>
>diff --git a/editor/libeditor/html/nsHTMLEditRules.cpp b/editor/libeditor/html/nsHTMLEditRules.cpp
>--- a/editor/libeditor/html/nsHTMLEditRules.cpp
>+++ b/editor/libeditor/html/nsHTMLEditRules.cpp
>@@ -364,17 +364,18 @@ nsHTMLEditRules::BeforeEdit(PRInt32 acti
>       nsCOMPtr<nsIRange> range = do_QueryInterface(mUtilRange);
>       range->Reset(); 
>     }
> 
>     // remember current inline styles for deletion and normal insertion operations
>     if ((action == nsEditor::kOpInsertText)      || 
>         (action == nsEditor::kOpInsertIMEText)   ||
>         (action == nsEditor::kOpDeleteSelection) ||
>-        (action == nsEditor::kOpInsertBreak))
>+        (action == nsEditor::kOpInsertBreak)     ||
>+        (action == nsHTMLEditor::kOpMakeList))
>     {
>       nsCOMPtr<nsIDOMNode> selNode = selStartNode;
>       if (aDirection == nsIEditor::eNext)
>         selNode = selEndNode;
>       res = CacheInlineStyles(selNode);
>       NS_ENSURE_SUCCESS(res, res);
>     }
>     
>@@ -543,17 +544,18 @@ nsHTMLEditRules::AfterEditInner(PRInt32 
>       res = AdjustSelection(selection, aDirection);
>       NS_ENSURE_SUCCESS(res, res);
>     }
> 
>     // check for any styles which were removed inappropriately
>     if ((action == nsEditor::kOpInsertText)      || 
>         (action == nsEditor::kOpInsertIMEText)   ||
>         (action == nsEditor::kOpDeleteSelection) ||
>-        (action == nsEditor::kOpInsertBreak))
>+        (action == nsEditor::kOpInsertBreak)     ||
>+        (action == nsHTMLEditor::kOpMakeList))
>     {
>       mHTMLEditor->mTypeInState->UpdateSelState(selection);
>       res = ReapplyCachedStyles();
>       NS_ENSURE_SUCCESS(res, res);
>       res = ClearCachedStyles();
>       NS_ENSURE_SUCCESS(res, res);
>     }    
>   }
>@@ -4414,19 +4416,22 @@ nsHTMLEditRules::CreateStyleForInsertTex
>       ((mTheAction == nsEditor::kOpInsertText ) ||
>        (mTheAction == nsEditor::kOpInsertIMEText) ||
>        (mTheAction == nsEditor::kOpInsertBreak) ||
>        (mTheAction == nsEditor::kOpDeleteSelection)))
>   {
>     res = ReapplyCachedStyles();
>     NS_ENSURE_SUCCESS(res, res);
>   }
>-  // either way we clear the cached styles array
>-  res = ClearCachedStyles();  
>-  NS_ENSURE_SUCCESS(res, res);
>+  // Hold on to our styles when creating a new list
>+  if (mTheAction != nsHTMLEditor::kOpMakeList) {
>+    // either way we clear the cached styles array
>+    res = ClearCachedStyles();
>+    NS_ENSURE_SUCCESS(res, res);
>+  }
> 
>   // next examine our present style and make sure default styles are either present or
>   // explicitly overridden.  If neither, add the default style to the TypeInState
>   PRInt32 j, defcon = mHTMLEditor->mDefaultStyles.Length();
>   for (j=0; j<defcon; j++)
>   {
>     PropItem *propItem = mHTMLEditor->mDefaultStyles[j];
>     NS_ENSURE_TRUE(propItem, NS_ERROR_NULL_POINTER);
>@@ -7435,17 +7440,18 @@ nsHTMLEditRules::ReapplyCachedStyles()
>       }
>       if (!bAny) // then check typeinstate and html style
>       {
>         res = mHTMLEditor->GetInlinePropertyBase(mCachedStyles[j].tag, &(mCachedStyles[j].attr), &(mCachedStyles[j].value), 
>                                                         &bFirst, &bAny, &bAll, &curValue, PR_FALSE);
>         NS_ENSURE_SUCCESS(res, res);
>       }
>       // this style has disappeared through deletion.  Add it onto our typeinstate:
>-      if (!bAny) 
>+      if (!bAny ||
>+          mTheAction == nsHTMLEditor::kOpMakeList)
>       {
>         mHTMLEditor->mTypeInState->SetProp(mCachedStyles[j].tag, mCachedStyles[j].attr, mCachedStyles[j].value);
>       }
>     }
>   }
>   return NS_OK;
> }
>

Actions: View | Diff | Review

Attachments on bug 590640: 471667 | 504055 | 623485 | 623486 | 623487 | 623488 | 623489 | 623609 | 623610 | 624737 | 624810