bug 83918 - Not able to start a list (number or bullets) when using Bold style
bug 62347 - Selecting "Body Text" doesn't change style if in <pre> text that has <br>
bug 86476 - ubercaret appears on multi-line text block
bug 87882 - pasting text from one bullet to another yields extra bullet
---------------
r=sfraser; sr=kin
Contextual information added to HTML copy and intelligence added to HTML paste in the editor (fixes bugs 47014, 50568 and 46554, and partly (at least) fixes bug 53188).
Code written by vidur, jfrancis, jst, akkana. Tested by jfrancis, akkana, vidur, jst, kin. Reviwed (and super reviewed) by waterson, vidur, kin, jfrancis, jst
r = jfrancis
a = ftang
fix proposed by m_kato@ga2.so-net.ne.jp
New events are added to support reconversion. As a result, many files
are affected. They are:
editor:
nsEditor.h nsEditor.cpp nsEditorEventListeners.cpp nsEditorEventListeners.h
nsHTMLEditor.h nsHTMLEditor.cpp nsIEditorIMESupport.h
dom and layout:
nsIPrivateCompositionEvent.h nsDOMEvent.h nsDOMEvnet.cpp nsEventListenerManager.cpp
nsIDOMCompositionListener.h
widget:
nsGUIEvent.h nsWindow.h nsWindow.cpp
mozilla/editor/base/nsEditor.cpp
mozilla/editor/base/nsEditor.h
- Added IsMozEditorBogusNode() method.
mozilla/editor/base/nsTextEditRules.cpp
- Modified CreateBogusNodeIfNeeded() to check if bodyChild is a
MozEditorBogusNode so that it doesn't create more than one.
- Modified DidUndo() and DidRedo() to use IsMozEditorBogusNode().
r=sfraser@netscape.com
Added some comments of the form "// XXX: ERROR_HANDLING <explanation>"
wherever I saw a potential error but wasn't 100% sure of the intention of the code.
Fixed a few bugs along the way.
editor/base/Makefile.in
editor/base/makefile.win
- Modified makefiles build files that were
renamed, and use new define to build the
API Logging code.
editor/base/nsEditor.cpp
editor/base/nsEditor.h
editor/base/nsHTMLEditor.cpp
- Removed all ENABLE_JS_EDITOR_LOG ifdef'd code.
- Removed all references to nsVector.h.
editor/base/nsEditorFactory.cpp
- Added ENABLE_EDITOR_API_LOG ifdef'd code
that will create an instance of nsHTMLEditorLog
instead of nsHTMLEditor.
editor/base/nsEditorTxnLog.cpp
- Initial checkin of file. File was originally named nsJSTxnLog.cpp.
editor/base/nsEditorTxnLog.h
- Initial checkin of file. File was originally named nsJSTxnLog.h.
editor/base/nsHTMLEditorLog.cpp
- Initial checkin of file. File was originally named nsJSEditorLog.cpp.
- nsHTMLEditorLog.cpp now derives from nsHTMLEditor, and only
overrides methods that modify the content tree and are publicly
available via XPIDL.
editor/base/nsHTMLEditorLog.h
- Initial checkin of file. File was originally named nsJSEditorLog.h.
- nsHTMLEditorLog.cpp now derives from nsHTMLEditor, and only
overrides methods that modify the content tree and are publicly
available via XPIDL.
a mime type and a flag argument. Also fix the following bugs:
9746: get rid of bogus empty <style> in head.
8143: save wrap column in editor shell in case it's set before the
editor is created.
9470, 9488: allow explicit specification of formatted output.
1. IsEditable is much less hacky. It basically says:
1. if the node is a special bogus text node, it's not editable
2. if the node is a text node with only newlines, then it's not editable
3. if the node has no frame associated with it, then it is not editable
4. otherwise, it is editable.
As part of this, I had to make IsEditable non-static. This had some cascading effects on static methods that called
IsEditable, which likewise had to be made non-static.
2. SetTextProperties now works when the endpoints are leaf nodes (like images), not just text. Charlie, you should
put this through some stress cases.
nsIHTMLEditor, nsITextEditor, and nsIEditorShell and enabled
the "Start Log" and "End Log" menu items in the editor test bed.
* Modified makefiles for Unix and Win32 to turn on Editor API Logging.
* Added action argument to the DeleteSelection() method in nsIEditorShell.
* Modified nsJSTxnLog to use nsJSEditorLog when writing it's output.
for HTML and CSS atoms, since we can't get these from layout yet. The old
use assumed one editor, but as we know many editors can exist simultaneously.
Now, the editors share a singleton which is fetched from a factory method,
saving memory and allocation overhead.
* Added some code to restore selection after RemoveTextProperty.
* Made a tiny change to the way the editor holds onto the transaction manager, so client (like the ender text control) can
turn undo on and off effectively
* Fixed a bug in IsNodeInline that was causing GetBlockParent to return the wrong parent node (and who knows what
other mischief) where atom compares were being done on strings of different case, for <B>, "b" vs. "B". The DOM
method nsIDOMElement::GetTagName forced the returned tag name to upper case. I don't know how long that has
been true, but I assume it's a fairly recent change (or something on our side related to it changed recently) or this method
never would have worked. I also found a few cases of nsString::Equals that I changed to EqualsIgnoreCase
* Made some general improvements to the interaction between editors and rules, so that the aCancel out param is always
intialized, and all rules with Will... are matched with a Did... call. Added Will/DidSetTextProperty() and
Will/DidRemoveTextProperty(). This helps enable plain text mode. Added a skeleton for max length support in text editor.
* fixed some warnings.
* added focus listener. Doesn't do much yet, but when focus notifications start appearing, we'll be ready for them. The code is in
place to hide selection when we lose focus and paint selection when we get focus. That's probably not quite right, but it's a start.
We will need to be able to determine the distinction between losing focus to another control within our app, and losing focus to
another app.
* added support for disabled and readonly states in the editor. This is accomplished by having flags set by the client, and letting the
rules system deal with those flags. The flags I added are:
TEXT_EDITOR_FLAG_PLAINTEXT 0x01 // only plain text editing is allowed
TEXT_EDITOR_FLAG_SINGLELINE 0x02 // enter key and CR-LF handled specially
TEXT_EDITOR_FLAG_PASSWORD 0x04 // text is not entered into content, only a representative character
TEXT_EDITOR_FLAG_READONLY 0x08 // editing events are disabled. Editor may still accept focus.
TEXT_EDITOR_FLAG_DISALBED 0x10 // all events are disabled (like scrolling). Editor will not accept focus.
* added WillInsertBreak/DidInsertBreak into text rules, so flags could be checked. This gets us readonly, disabled, and single line
behavior.
* cleaned up the code that allocates, registers, and destroys event listeners. Thanks to Kin and Simon for cleaning up the
ownership model on the listeners, it was a big help.
* added support for a max text length. You can now tell the text editor, be no bigger than n characters.
features like set paragraph style, set list type, indent, etc. I'm sure there's holes in my
implementation that these high level features will make obvious.
2. I've factored a lot of utility methods from several modules into nsEditor as public static methods.
This makes them easily accessable to all, and will help Joe and I remove redundant methods.
3. I changed the HTML tags to lower case, and made all string compares case-insensitive. No, this
isn't quite the right thing to do, but we don't have atoms from layout yet. The Right Thing is for us
to reuse those atoms.
Split nsEditor::DeleteSelectionAndCreateNode into two parts,
so that routines like InsertImage which need to set attributes
on the new node before inserting into the tree can do so.
This is somewhat temporary, since the current method isn't undo-able;
undo will be implemented after M4.
added aFirst out param to GetTextProperty, so the caller can know if the first character has the property in the case of aAny=true and aAll=false.
fixed a bunch of places where result was being used incorrectly as a return val from do_QueryInterface
some minor undo/redo fixes to split and join of interior nodes.
made a special case for typing with BR as the selection (as after an InsertBreak.)
made DEL and BACKSPACE at the beginning and end of a text node
fixes bugs 3742 and 3756 (with permission from choff and gkostello)
Added nsEditor::DoInitialInsert() for doing first insert into an empty document. Try typing into <html><body></body></html>
Added some smarts to DeleteSelectionAndCreateNode() so it only splits the selected node when appropriate (when the selection is not at offset 0 or max)
CreateElementTxn now creates text nodes as well as DOM elements
trivial to add more properties
finished first cut at SetTextProperty. This triggers lots of crashes in
range/selection code where we're holding onto a stale frame pointer (at
least, that's my best guess.)
synched with Charlie's change-o-rama
added an assert in DeleteTextTxn::Init() checking aNumCharsToDelete vs.
0
NS_ASSERTION(0!=aNumCharsToDelete, "bad arg, numCharsToDelete");
if the number of chars to delete is 0, we shouldn't be creating a
transaction at all. I had never seen this condition arise before
Charlie's checkin, I don't know if he introduced it or if it was a
latent bug I just never tripped over before.
added nsEditProperty
beginning of implementation for SetTextProperties. Currently, it only works if the selection is entirely within a single text node. Currently only
supports bold and italic (mapped to ctrl-b and ctrl-i for testing purposes.)
changed a bunch of interfaces to make things easier, like CreateElement now returns (as an out-param) the element created.
updated to new nsCOMPtr usage
nsTextEditor::InsertBreak() implemented
splits the text node at the caret (deletes any extended selection to force a collapsed selection.)
inserts a <BR> which I assume we'll convert to a CR when we write to a text stream.
undo and redo work, except for the bug noted below
More stuff:
interface cleanup
strategic debugging code added
delete selection txn sets the collapses the selection...this is just a placeholder, but I needed it for undo/redo of InsertBreak.
join and split now work for text nodes as well as interior nodes
* the TxnMgr is invoked by the editor via nsRepository
* editor.h|cpp have been renamed nsEditor.h|cpp for consistency
* editorInterfaces.h|cpp have been renamed nsEditorEventListeners.c|hpp
* added nsITextEditor.h, nsTextEditor.h|cpp. The text editor is a placeholder for the rules unique to text
editing. It invokes the nsIEditor to do core editing operations.
* reworked nsIEditor and related interfaces as per emerging design.
* nsEditor::BeginTransaction and EndTransaction call nsTransactionManager::BeginBatch and EndBatch.
jfrancis%netscape.com
cmanske%netscape.com
mjudge%netscape.com
akkana%netscape.com
anthonyd%netscape.com
sfraser%netscape.com
jst%netscape.com
shanjian%netscape.com
kin%netscape.com
ftang%netscape.com
dmose%mozilla.org
buster%netscape.com
tague%netscape.com
waterson%netscape.com
kostello%netscape.com
warren%netscape.com
mcafee%netscape.com