mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Finished HTML Source editing problems with title tag (41869), split table crash (50791), filename problems (48631). r=akkana, fixed NS_LITERAL_STRING usages in nsHTMLEditor for performance (26384), r=scc

This commit is contained in:
cmanske%netscape.com 2000-08-30 22:49:08 +00:00
Родитель 5c6f2f818d
Коммит 08508c8980
7 изменённых файлов: 227 добавлений и 112 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

26
editor/base/nsEditorShell.cpp
Просмотреть файл

@ -1783,14 +1783,36 @@ nsEditorShell::SaveDocument(PRBool saveAs, PRBool saveCopy, PRBool *_retval)
if ( (urlstring.CompareWithConversion("file", PR_TRUE, 4) != 0 )
&& (urlstring.CompareWithConversion("about:blank", PR_TRUE, -1) != 0) )
{
// remove cruft before file name including '/'
// if the url ends with a '/' then the whole string will be cut
PRInt32 index = urlstring.RFindChar((PRUnichar)'/', PR_FALSE, -1, -1 );
if ( index != -1 )
{
// remove cruft before file name including '/'
// if the url ends with a '/' then the whole string will be cut
urlstring.Cut(0, index + 1);
if (urlstring.Length() > 0)
{
// Then truncate at any existing "#", "?" or "." since we replace with ".html"
index = urlstring.RFindChar((PRUnichar)'.', PR_FALSE, -1, -1 );
if ( index != -1)
urlstring.Truncate(index);
if (urlstring.Length() > 0)
{
index = urlstring.RFindChar((PRUnichar)'#', PR_FALSE, -1, -1 );
if ( index != -1)
urlstring.Truncate(index);
if (urlstring.Length() > 0)
{
index = urlstring.RFindChar((PRUnichar)'?', PR_FALSE, -1, -1 );
if ( index != -1)
urlstring.Truncate(index);
}
}
if (urlstring.Length() > 0)
{
fileName.Assign( urlstring );
fileName.AppendWithConversion(".html");
}
}
}
}

75
editor/base/nsHTMLEditor.cpp
Просмотреть файл

@ -464,8 +464,7 @@ nsHTMLEditor::SetDocumentCharacterSet(const PRUnichar* characterSet)
PRBool newMetaCharset = PR_TRUE;
// get a list of META tags
// can't use |NS_LITERAL_STRING| here until |GetElementsByTagName| is fixed to accept readables
result = domdoc->GetElementsByTagName(NS_ConvertASCIItoUCS2("meta"), getter_AddRefs(metaList));
result = domdoc->GetElementsByTagName(NS_LITERAL_STRING("meta"), getter_AddRefs(metaList));
if (NS_SUCCEEDED(result) && metaList) {
PRUint32 listLength = 0;
(void) metaList->GetLength(&listLength);
@ -479,19 +478,16 @@ nsHTMLEditor::SetDocumentCharacterSet(const PRUnichar* characterSet)
const NS_ConvertASCIItoUCS2 content("charset=");
nsString currentValue;
// can't use |NS_LITERAL_STRING| here until |GetAttribute| is fixed to accept readables
if (NS_FAILED(metaElement->GetAttribute(NS_ConvertASCIItoUCS2("http-equiv"), currentValue))) continue;
if (NS_FAILED(metaElement->GetAttribute(NS_LITERAL_STRING("http-equiv"), currentValue))) continue;
if (kNotFound != currentValue.Find("content-type", PR_TRUE)) {
if (NS_FAILED(metaElement->GetAttribute(NS_ConvertASCIItoUCS2("content"), currentValue))) continue;
// can't use |NS_LITERAL_STRING| here until |GetAttribute| is fixed to accept readables
if (NS_FAILED(metaElement->GetAttribute(NS_LITERAL_STRING("content"), currentValue))) continue;
PRInt32 offset = currentValue.Find(content.GetUnicode(), PR_TRUE);
if (kNotFound != offset) {
currentValue.Left(newMetaString, offset); // copy current value before "charset=" (e.g. text/html)
newMetaString.Append(content);
newMetaString.Append(characterSet);
// can't use |NS_LITERAL_STRING| here until |SetAttributeSetAttribute| is fixed to accept readables
result = nsEditor::SetAttribute(metaElement, NS_ConvertASCIItoUCS2("content"), newMetaString);
if (NS_SUCCEEDED(result))
newMetaCharset = PR_FALSE;
@ -506,8 +502,7 @@ nsHTMLEditor::SetDocumentCharacterSet(const PRUnichar* characterSet)
nsCOMPtr<nsIDOMNode>headNode;
nsCOMPtr<nsIDOMNode>resultNode;
// can't use |NS_LITERAL_STRING| here until |GetElementsByTagName| is fixed to accept readables
result = domdoc->GetElementsByTagName(NS_ConvertASCIItoUCS2("head"),getter_AddRefs(headList));
result = domdoc->GetElementsByTagName(NS_LITERAL_STRING("head"),getter_AddRefs(headList));
if (NS_SUCCEEDED(result) && headList) {
headList->Item(0, getter_AddRefs(headNode));
if (headNode) {
@ -522,14 +517,12 @@ nsHTMLEditor::SetDocumentCharacterSet(const PRUnichar* characterSet)
metaElement = do_QueryInterface(resultNode);
if (metaElement) {
// not undoable, undo should undo CreateNode
// can't use |NS_LITERAL_STRING| here until |SetAttribute| is fixed to accept readables
result = metaElement->SetAttribute(NS_ConvertASCIItoUCS2("http-equiv"), NS_ConvertASCIItoUCS2("Content-Type"));
result = metaElement->SetAttribute(NS_LITERAL_STRING("http-equiv"), NS_LITERAL_STRING("Content-Type"));
if (NS_SUCCEEDED(result)) {
newMetaString.AssignWithConversion("text/html;charset=");
newMetaString.Append(characterSet);
// not undoable, undo should undo CreateNode
// can't use |NS_LITERAL_STRING| here until |SetAttribute| is fixed to accept readables
result = metaElement->SetAttribute(NS_ConvertASCIItoUCS2("content"), newMetaString);
result = metaElement->SetAttribute(NS_LITERAL_STRING("content"), newMetaString);
}
}
}
@ -2432,12 +2425,12 @@ NS_IMETHODIMP nsHTMLEditor::InsertHTMLWithCharset(const nsString& aInputString,
nsAutoString inputString (aInputString); // hope this does copy-on-write
// Windows linebreaks: Map CRLF to LF:
inputString.ReplaceSubstring(NS_LITERAL_STRING("\r\n"),
NS_LITERAL_STRING("\n"));
inputString.ReplaceSubstring(NS_ConvertASCIItoUCS2("\r\n"),
NS_ConvertASCIItoUCS2("\n"));
// Mac linebreaks: Map any remaining CR to LF:
inputString.ReplaceSubstring(NS_LITERAL_STRING("\r"),
NS_LITERAL_STRING("\n"));
inputString.ReplaceSubstring(NS_ConvertASCIItoUCS2("\r"),
NS_ConvertASCIItoUCS2("\n"));
ForceCompositionEnd();
nsAutoEditBatch beginBatching(this);
@ -2601,12 +2594,12 @@ nsHTMLEditor::ReplaceHeadContentsWithHTML(const nsString &aSourceToInsert)
nsAutoString inputString (aSourceToInsert); // hope this does copy-on-write
// Windows linebreaks: Map CRLF to LF:
inputString.ReplaceSubstring(NS_LITERAL_STRING("\r\n"),
NS_LITERAL_STRING("\n"));
inputString.ReplaceSubstring(NS_ConvertASCIItoUCS2("\r\n"),
NS_ConvertASCIItoUCS2("\n"));
// Mac linebreaks: Map any remaining CR to LF:
inputString.ReplaceSubstring(NS_LITERAL_STRING("\r"),
NS_LITERAL_STRING("\n"));
inputString.ReplaceSubstring(NS_ConvertASCIItoUCS2("\r"),
NS_ConvertASCIItoUCS2("\n"));
nsAutoEditBatch beginBatching(this);
@ -2626,6 +2619,10 @@ nsHTMLEditor::ReplaceHeadContentsWithHTML(const nsString &aSourceToInsert)
nsCOMPtr<nsIDOMDocumentFragment> docfrag;
res = nsrange->CreateContextualFragment(inputString,
getter_AddRefs(docfrag));
//XXXX BUG: This is not returning the text between <title> ... </title>
// Special code is needed in JS to handle title anyway, so it really doesn't matter!
if (NS_FAILED(res))
{
#ifdef DEBUG
@ -2682,14 +2679,14 @@ nsHTMLEditor::RebuildDocumentFromSource(const nsString& aSourceString)
// Find where the <body> tag starts.
// If user mangled that, then abort
PRInt32 bodyStart = aSourceString.Find(NS_LITERAL_STRING("<body"), PR_TRUE);
PRInt32 bodyStart = aSourceString.Find(NS_ConvertASCIItoUCS2("<body"), PR_TRUE);
if (bodyStart == -1) return NS_ERROR_FAILURE;
PRInt32 headStart = aSourceString.Find(NS_LITERAL_STRING("<head"), PR_TRUE);
PRInt32 headStart = aSourceString.Find(NS_ConvertASCIItoUCS2("<head"), PR_TRUE);
if (headStart == -1) return NS_ERROR_FAILURE;
// Find the index after "<head>"
PRInt32 headEnd = aSourceString.Find(NS_LITERAL_STRING("</head"), PR_TRUE);
PRInt32 headEnd = aSourceString.Find(NS_ConvertASCIItoUCS2("</head"), PR_TRUE);
// We'll be forgiving and assume head ends before body
if (headEnd == -1) headEnd = bodyStart;
@ -2724,7 +2721,7 @@ nsHTMLEditor::RebuildDocumentFromSource(const nsString& aSourceString)
// Kludge of the year: fool the parser by replacing "body" with "div" so we get a node
bodyString.ToLowerCase();
bodyString.ReplaceSubstring(NS_LITERAL_STRING("body"), NS_LITERAL_STRING("div"));
bodyString.ReplaceSubstring(NS_ConvertASCIItoUCS2("body"), NS_ConvertASCIItoUCS2("div"));
nsCOMPtr<nsIDOMRange> range;
res = selection->GetRangeAt(0, getter_AddRefs(range));
@ -4054,26 +4051,26 @@ nsHTMLEditor::CreateElementWithDefaults(const nsString& aTagName, nsIDOMElement*
return NS_ERROR_FAILURE;
// Mark the new element dirty, so it will be formatted
newElement->SetAttribute(NS_ConvertASCIItoUCS2("_moz_dirty"), nsAutoString());
newElement->SetAttribute(NS_LITERAL_STRING("_moz_dirty"), nsAutoString());
// Set default values for new elements
if (TagName.EqualsWithConversion("hr"))
{
// Note that we read the user's attributes for these from prefs (in InsertHLine JS)
newElement->SetAttribute(NS_ConvertASCIItoUCS2("align"),NS_ConvertASCIItoUCS2("center"));
newElement->SetAttribute(NS_ConvertASCIItoUCS2("width"),NS_ConvertASCIItoUCS2("100%"));
newElement->SetAttribute(NS_ConvertASCIItoUCS2("size"),NS_ConvertASCIItoUCS2("2"));
newElement->SetAttribute(NS_LITERAL_STRING("align"),NS_LITERAL_STRING("center"));
newElement->SetAttribute(NS_LITERAL_STRING("width"),NS_LITERAL_STRING("100%"));
newElement->SetAttribute(NS_LITERAL_STRING("size"),NS_LITERAL_STRING("2"));
} else if (TagName.EqualsWithConversion("table"))
{
newElement->SetAttribute(NS_ConvertASCIItoUCS2("cellpadding"),NS_ConvertASCIItoUCS2("2"));
newElement->SetAttribute(NS_ConvertASCIItoUCS2("cellspacing"),NS_ConvertASCIItoUCS2("2"));
newElement->SetAttribute(NS_ConvertASCIItoUCS2("border"),NS_ConvertASCIItoUCS2("1"));
newElement->SetAttribute(NS_LITERAL_STRING("cellpadding"),NS_LITERAL_STRING("2"));
newElement->SetAttribute(NS_LITERAL_STRING("cellspacing"),NS_LITERAL_STRING("2"));
newElement->SetAttribute(NS_LITERAL_STRING("border"),NS_LITERAL_STRING("1"));
} else if (TagName.EqualsWithConversion("tr"))
{
newElement->SetAttribute(NS_ConvertASCIItoUCS2("valign"),NS_ConvertASCIItoUCS2("top"));
newElement->SetAttribute(NS_LITERAL_STRING("valign"),NS_LITERAL_STRING("top"));
} else if (TagName.EqualsWithConversion("td"))
{
newElement->SetAttribute(NS_ConvertASCIItoUCS2("valign"),NS_ConvertASCIItoUCS2("top"));
newElement->SetAttribute(NS_LITERAL_STRING("valign"),NS_LITERAL_STRING("top"));
}
// ADD OTHER TAGS HERE
@ -5487,11 +5484,11 @@ nsHTMLEditor::InsertAsPlaintextQuotation(const nsString& aQuotedText,
nsCOMPtr<nsIDOMElement> preElement (do_QueryInterface(preNode));
if (preElement)
{
preElement->SetAttribute(NS_ConvertASCIItoUCS2("_moz_quote"),
NS_ConvertASCIItoUCS2("true"));
preElement->SetAttribute(NS_LITERAL_STRING("_moz_quote"),
NS_LITERAL_STRING("true"));
// set style to not have unwanted vertical margins
preElement->SetAttribute(NS_ConvertASCIItoUCS2("style"),
NS_ConvertASCIItoUCS2("margin: 0 0 0 0px;"));
preElement->SetAttribute(NS_LITERAL_STRING("style"),
NS_LITERAL_STRING("margin: 0 0 0 0px;"));
}
// and set the selection inside it:
@ -5949,7 +5946,7 @@ nsHTMLEditor::GetHeadContentsAsHTML(nsString& aOutputString)
{
// Selection always includes <body></body>,
// so terminate there
PRInt32 offset = aOutputString.Find(NS_LITERAL_STRING("<body"), PR_TRUE);
PRInt32 offset = aOutputString.Find(NS_ConvertASCIItoUCS2("<body"), PR_TRUE);
if (offset > 0)
{
// Ensure the string ends in a newline

42
editor/base/nsTableEditor.cpp
Просмотреть файл

@ -1744,6 +1744,7 @@ nsHTMLEditor::SplitCellIntoColumns(nsIDOMElement *aTable, PRInt32 aRowIndex, PRI
nsIDOMElement **aNewCell)
{
if (!aTable) return NS_ERROR_NULL_POINTER;
if (aNewCell) *aNewCell = nsnull;
nsCOMPtr<nsIDOMElement> cell;
PRInt32 startRowIndex, startColIndex, rowSpan, colSpan, actualRowSpan, actualColSpan;
@ -1762,11 +1763,21 @@ nsHTMLEditor::SplitCellIntoColumns(nsIDOMElement *aTable, PRInt32 aRowIndex, PRI
res = SetColSpan(cell, aColSpanLeft);
if (NS_FAILED(res)) return res;
// Insert new cell after using the remaining span;
res = InsertCell(cell, actualRowSpan, aColSpanRight, PR_TRUE, PR_FALSE, aNewCell);
// Insert new cell after using the remaining span
// and always get the new cell so we can copy the background color;
nsCOMPtr<nsIDOMElement> newCell;
res = InsertCell(cell, actualRowSpan, aColSpanRight, PR_TRUE, PR_FALSE, getter_AddRefs(newCell));
if (NS_FAILED(res)) return res;
return CopyCellBackgroundColor(*aNewCell, cell);
if (newCell)
{
if (aNewCell)
{
*aNewCell = newCell.get();
NS_ADDREF(*aNewCell);
}
res = CopyCellBackgroundColor(newCell, cell);
}
return res;
}
NS_IMETHODIMP
@ -1775,6 +1786,7 @@ nsHTMLEditor::SplitCellIntoRows(nsIDOMElement *aTable, PRInt32 aRowIndex, PRInt3
nsIDOMElement **aNewCell)
{
if (!aTable) return NS_ERROR_NULL_POINTER;
if (aNewCell) *aNewCell = nsnull;
nsCOMPtr<nsIDOMElement> cell;
PRInt32 startRowIndex, startColIndex, rowSpan, colSpan, actualRowSpan, actualColSpan;
@ -1857,7 +1869,25 @@ nsHTMLEditor::SplitCellIntoRows(nsIDOMElement *aTable, PRInt32 aRowIndex, PRInt3
res = SetRowSpan(cell, aRowSpanAbove);
if (NS_FAILED(res)) return res;
res = InsertCell(cell2, aRowSpanBelow, actualColSpan, insertAfter, PR_FALSE, aNewCell);
// Insert new cell after using the remaining span
// and always get the new cell so we can copy the background color;
nsCOMPtr<nsIDOMElement> newCell;
res = InsertCell(cell2, aRowSpanBelow, actualColSpan, insertAfter, PR_FALSE, getter_AddRefs(newCell));
if (NS_FAILED(res)) return res;
if (newCell)
{
if (aNewCell)
{
*aNewCell = newCell.get();
NS_ADDREF(*aNewCell);
}
res = CopyCellBackgroundColor(newCell, cell2);
}
return res;
if (NS_FAILED(res)) return res;
return CopyCellBackgroundColor(*aNewCell, cell);
@ -1899,7 +1929,7 @@ nsHTMLEditor::SwitchTableCellHeaderType(nsIDOMElement *aSourceCell, nsIDOMElemen
if (aNewCell)
{
nsCOMPtr<nsIDOMElement> newElement = do_QueryInterface(newNode);
*aNewCell = newElement;
*aNewCell = newElement.get();
NS_ADDREF(*aNewCell);
}

26
editor/composer/src/nsEditorShell.cpp
Просмотреть файл

@ -1783,14 +1783,36 @@ nsEditorShell::SaveDocument(PRBool saveAs, PRBool saveCopy, PRBool *_retval)
if ( (urlstring.CompareWithConversion("file", PR_TRUE, 4) != 0 )
&& (urlstring.CompareWithConversion("about:blank", PR_TRUE, -1) != 0) )
{
// remove cruft before file name including '/'
// if the url ends with a '/' then the whole string will be cut
PRInt32 index = urlstring.RFindChar((PRUnichar)'/', PR_FALSE, -1, -1 );
if ( index != -1 )
{
// remove cruft before file name including '/'
// if the url ends with a '/' then the whole string will be cut
urlstring.Cut(0, index + 1);
if (urlstring.Length() > 0)
{
// Then truncate at any existing "#", "?" or "." since we replace with ".html"
index = urlstring.RFindChar((PRUnichar)'.', PR_FALSE, -1, -1 );
if ( index != -1)
urlstring.Truncate(index);
if (urlstring.Length() > 0)
{
index = urlstring.RFindChar((PRUnichar)'#', PR_FALSE, -1, -1 );
if ( index != -1)
urlstring.Truncate(index);
if (urlstring.Length() > 0)
{
index = urlstring.RFindChar((PRUnichar)'?', PR_FALSE, -1, -1 );
if ( index != -1)
urlstring.Truncate(index);
}
}
if (urlstring.Length() > 0)
{
fileName.Assign( urlstring );
fileName.AppendWithConversion(".html");
}
}
}
}

75
editor/libeditor/html/nsHTMLEditor.cpp
Просмотреть файл

@ -464,8 +464,7 @@ nsHTMLEditor::SetDocumentCharacterSet(const PRUnichar* characterSet)
PRBool newMetaCharset = PR_TRUE;
// get a list of META tags
// can't use |NS_LITERAL_STRING| here until |GetElementsByTagName| is fixed to accept readables
result = domdoc->GetElementsByTagName(NS_ConvertASCIItoUCS2("meta"), getter_AddRefs(metaList));
result = domdoc->GetElementsByTagName(NS_LITERAL_STRING("meta"), getter_AddRefs(metaList));
if (NS_SUCCEEDED(result) && metaList) {
PRUint32 listLength = 0;
(void) metaList->GetLength(&listLength);
@ -479,19 +478,16 @@ nsHTMLEditor::SetDocumentCharacterSet(const PRUnichar* characterSet)
const NS_ConvertASCIItoUCS2 content("charset=");
nsString currentValue;
// can't use |NS_LITERAL_STRING| here until |GetAttribute| is fixed to accept readables
if (NS_FAILED(metaElement->GetAttribute(NS_ConvertASCIItoUCS2("http-equiv"), currentValue))) continue;
if (NS_FAILED(metaElement->GetAttribute(NS_LITERAL_STRING("http-equiv"), currentValue))) continue;
if (kNotFound != currentValue.Find("content-type", PR_TRUE)) {
if (NS_FAILED(metaElement->GetAttribute(NS_ConvertASCIItoUCS2("content"), currentValue))) continue;
// can't use |NS_LITERAL_STRING| here until |GetAttribute| is fixed to accept readables
if (NS_FAILED(metaElement->GetAttribute(NS_LITERAL_STRING("content"), currentValue))) continue;
PRInt32 offset = currentValue.Find(content.GetUnicode(), PR_TRUE);
if (kNotFound != offset) {
currentValue.Left(newMetaString, offset); // copy current value before "charset=" (e.g. text/html)
newMetaString.Append(content);
newMetaString.Append(characterSet);
// can't use |NS_LITERAL_STRING| here until |SetAttributeSetAttribute| is fixed to accept readables
result = nsEditor::SetAttribute(metaElement, NS_ConvertASCIItoUCS2("content"), newMetaString);
if (NS_SUCCEEDED(result))
newMetaCharset = PR_FALSE;
@ -506,8 +502,7 @@ nsHTMLEditor::SetDocumentCharacterSet(const PRUnichar* characterSet)
nsCOMPtr<nsIDOMNode>headNode;
nsCOMPtr<nsIDOMNode>resultNode;
// can't use |NS_LITERAL_STRING| here until |GetElementsByTagName| is fixed to accept readables
result = domdoc->GetElementsByTagName(NS_ConvertASCIItoUCS2("head"),getter_AddRefs(headList));
result = domdoc->GetElementsByTagName(NS_LITERAL_STRING("head"),getter_AddRefs(headList));
if (NS_SUCCEEDED(result) && headList) {
headList->Item(0, getter_AddRefs(headNode));
if (headNode) {
@ -522,14 +517,12 @@ nsHTMLEditor::SetDocumentCharacterSet(const PRUnichar* characterSet)
metaElement = do_QueryInterface(resultNode);
if (metaElement) {
// not undoable, undo should undo CreateNode
// can't use |NS_LITERAL_STRING| here until |SetAttribute| is fixed to accept readables
result = metaElement->SetAttribute(NS_ConvertASCIItoUCS2("http-equiv"), NS_ConvertASCIItoUCS2("Content-Type"));
result = metaElement->SetAttribute(NS_LITERAL_STRING("http-equiv"), NS_LITERAL_STRING("Content-Type"));
if (NS_SUCCEEDED(result)) {
newMetaString.AssignWithConversion("text/html;charset=");
newMetaString.Append(characterSet);
// not undoable, undo should undo CreateNode
// can't use |NS_LITERAL_STRING| here until |SetAttribute| is fixed to accept readables
result = metaElement->SetAttribute(NS_ConvertASCIItoUCS2("content"), newMetaString);
result = metaElement->SetAttribute(NS_LITERAL_STRING("content"), newMetaString);
}
}
}
@ -2432,12 +2425,12 @@ NS_IMETHODIMP nsHTMLEditor::InsertHTMLWithCharset(const nsString& aInputString,
nsAutoString inputString (aInputString); // hope this does copy-on-write
// Windows linebreaks: Map CRLF to LF:
inputString.ReplaceSubstring(NS_LITERAL_STRING("\r\n"),
NS_LITERAL_STRING("\n"));
inputString.ReplaceSubstring(NS_ConvertASCIItoUCS2("\r\n"),
NS_ConvertASCIItoUCS2("\n"));
// Mac linebreaks: Map any remaining CR to LF:
inputString.ReplaceSubstring(NS_LITERAL_STRING("\r"),
NS_LITERAL_STRING("\n"));
inputString.ReplaceSubstring(NS_ConvertASCIItoUCS2("\r"),
NS_ConvertASCIItoUCS2("\n"));
ForceCompositionEnd();
nsAutoEditBatch beginBatching(this);
@ -2601,12 +2594,12 @@ nsHTMLEditor::ReplaceHeadContentsWithHTML(const nsString &aSourceToInsert)
nsAutoString inputString (aSourceToInsert); // hope this does copy-on-write
// Windows linebreaks: Map CRLF to LF:
inputString.ReplaceSubstring(NS_LITERAL_STRING("\r\n"),
NS_LITERAL_STRING("\n"));
inputString.ReplaceSubstring(NS_ConvertASCIItoUCS2("\r\n"),
NS_ConvertASCIItoUCS2("\n"));
// Mac linebreaks: Map any remaining CR to LF:
inputString.ReplaceSubstring(NS_LITERAL_STRING("\r"),
NS_LITERAL_STRING("\n"));
inputString.ReplaceSubstring(NS_ConvertASCIItoUCS2("\r"),
NS_ConvertASCIItoUCS2("\n"));
nsAutoEditBatch beginBatching(this);
@ -2626,6 +2619,10 @@ nsHTMLEditor::ReplaceHeadContentsWithHTML(const nsString &aSourceToInsert)
nsCOMPtr<nsIDOMDocumentFragment> docfrag;
res = nsrange->CreateContextualFragment(inputString,
getter_AddRefs(docfrag));
//XXXX BUG: This is not returning the text between <title> ... </title>
// Special code is needed in JS to handle title anyway, so it really doesn't matter!
if (NS_FAILED(res))
{
#ifdef DEBUG
@ -2682,14 +2679,14 @@ nsHTMLEditor::RebuildDocumentFromSource(const nsString& aSourceString)
// Find where the <body> tag starts.
// If user mangled that, then abort
PRInt32 bodyStart = aSourceString.Find(NS_LITERAL_STRING("<body"), PR_TRUE);
PRInt32 bodyStart = aSourceString.Find(NS_ConvertASCIItoUCS2("<body"), PR_TRUE);
if (bodyStart == -1) return NS_ERROR_FAILURE;
PRInt32 headStart = aSourceString.Find(NS_LITERAL_STRING("<head"), PR_TRUE);
PRInt32 headStart = aSourceString.Find(NS_ConvertASCIItoUCS2("<head"), PR_TRUE);
if (headStart == -1) return NS_ERROR_FAILURE;
// Find the index after "<head>"
PRInt32 headEnd = aSourceString.Find(NS_LITERAL_STRING("</head"), PR_TRUE);
PRInt32 headEnd = aSourceString.Find(NS_ConvertASCIItoUCS2("</head"), PR_TRUE);
// We'll be forgiving and assume head ends before body
if (headEnd == -1) headEnd = bodyStart;
@ -2724,7 +2721,7 @@ nsHTMLEditor::RebuildDocumentFromSource(const nsString& aSourceString)
// Kludge of the year: fool the parser by replacing "body" with "div" so we get a node
bodyString.ToLowerCase();
bodyString.ReplaceSubstring(NS_LITERAL_STRING("body"), NS_LITERAL_STRING("div"));
bodyString.ReplaceSubstring(NS_ConvertASCIItoUCS2("body"), NS_ConvertASCIItoUCS2("div"));
nsCOMPtr<nsIDOMRange> range;
res = selection->GetRangeAt(0, getter_AddRefs(range));
@ -4054,26 +4051,26 @@ nsHTMLEditor::CreateElementWithDefaults(const nsString& aTagName, nsIDOMElement*
return NS_ERROR_FAILURE;
// Mark the new element dirty, so it will be formatted
newElement->SetAttribute(NS_ConvertASCIItoUCS2("_moz_dirty"), nsAutoString());
newElement->SetAttribute(NS_LITERAL_STRING("_moz_dirty"), nsAutoString());
// Set default values for new elements
if (TagName.EqualsWithConversion("hr"))
{
// Note that we read the user's attributes for these from prefs (in InsertHLine JS)
newElement->SetAttribute(NS_ConvertASCIItoUCS2("align"),NS_ConvertASCIItoUCS2("center"));
newElement->SetAttribute(NS_ConvertASCIItoUCS2("width"),NS_ConvertASCIItoUCS2("100%"));
newElement->SetAttribute(NS_ConvertASCIItoUCS2("size"),NS_ConvertASCIItoUCS2("2"));
newElement->SetAttribute(NS_LITERAL_STRING("align"),NS_LITERAL_STRING("center"));
newElement->SetAttribute(NS_LITERAL_STRING("width"),NS_LITERAL_STRING("100%"));
newElement->SetAttribute(NS_LITERAL_STRING("size"),NS_LITERAL_STRING("2"));
} else if (TagName.EqualsWithConversion("table"))
{
newElement->SetAttribute(NS_ConvertASCIItoUCS2("cellpadding"),NS_ConvertASCIItoUCS2("2"));
newElement->SetAttribute(NS_ConvertASCIItoUCS2("cellspacing"),NS_ConvertASCIItoUCS2("2"));
newElement->SetAttribute(NS_ConvertASCIItoUCS2("border"),NS_ConvertASCIItoUCS2("1"));
newElement->SetAttribute(NS_LITERAL_STRING("cellpadding"),NS_LITERAL_STRING("2"));
newElement->SetAttribute(NS_LITERAL_STRING("cellspacing"),NS_LITERAL_STRING("2"));
newElement->SetAttribute(NS_LITERAL_STRING("border"),NS_LITERAL_STRING("1"));
} else if (TagName.EqualsWithConversion("tr"))
{
newElement->SetAttribute(NS_ConvertASCIItoUCS2("valign"),NS_ConvertASCIItoUCS2("top"));
newElement->SetAttribute(NS_LITERAL_STRING("valign"),NS_LITERAL_STRING("top"));
} else if (TagName.EqualsWithConversion("td"))
{
newElement->SetAttribute(NS_ConvertASCIItoUCS2("valign"),NS_ConvertASCIItoUCS2("top"));
newElement->SetAttribute(NS_LITERAL_STRING("valign"),NS_LITERAL_STRING("top"));
}
// ADD OTHER TAGS HERE
@ -5487,11 +5484,11 @@ nsHTMLEditor::InsertAsPlaintextQuotation(const nsString& aQuotedText,
nsCOMPtr<nsIDOMElement> preElement (do_QueryInterface(preNode));
if (preElement)
{
preElement->SetAttribute(NS_ConvertASCIItoUCS2("_moz_quote"),
NS_ConvertASCIItoUCS2("true"));
preElement->SetAttribute(NS_LITERAL_STRING("_moz_quote"),
NS_LITERAL_STRING("true"));
// set style to not have unwanted vertical margins
preElement->SetAttribute(NS_ConvertASCIItoUCS2("style"),
NS_ConvertASCIItoUCS2("margin: 0 0 0 0px;"));
preElement->SetAttribute(NS_LITERAL_STRING("style"),
NS_LITERAL_STRING("margin: 0 0 0 0px;"));
}
// and set the selection inside it:
@ -5949,7 +5946,7 @@ nsHTMLEditor::GetHeadContentsAsHTML(nsString& aOutputString)
{
// Selection always includes <body></body>,
// so terminate there
PRInt32 offset = aOutputString.Find(NS_LITERAL_STRING("<body"), PR_TRUE);
PRInt32 offset = aOutputString.Find(NS_ConvertASCIItoUCS2("<body"), PR_TRUE);
if (offset > 0)
{
// Ensure the string ends in a newline

42
editor/libeditor/html/nsTableEditor.cpp
Просмотреть файл

@ -1744,6 +1744,7 @@ nsHTMLEditor::SplitCellIntoColumns(nsIDOMElement *aTable, PRInt32 aRowIndex, PRI
nsIDOMElement **aNewCell)
{
if (!aTable) return NS_ERROR_NULL_POINTER;
if (aNewCell) *aNewCell = nsnull;
nsCOMPtr<nsIDOMElement> cell;
PRInt32 startRowIndex, startColIndex, rowSpan, colSpan, actualRowSpan, actualColSpan;
@ -1762,11 +1763,21 @@ nsHTMLEditor::SplitCellIntoColumns(nsIDOMElement *aTable, PRInt32 aRowIndex, PRI
res = SetColSpan(cell, aColSpanLeft);
if (NS_FAILED(res)) return res;
// Insert new cell after using the remaining span;
res = InsertCell(cell, actualRowSpan, aColSpanRight, PR_TRUE, PR_FALSE, aNewCell);
// Insert new cell after using the remaining span
// and always get the new cell so we can copy the background color;
nsCOMPtr<nsIDOMElement> newCell;
res = InsertCell(cell, actualRowSpan, aColSpanRight, PR_TRUE, PR_FALSE, getter_AddRefs(newCell));
if (NS_FAILED(res)) return res;
return CopyCellBackgroundColor(*aNewCell, cell);
if (newCell)
{
if (aNewCell)
{
*aNewCell = newCell.get();
NS_ADDREF(*aNewCell);
}
res = CopyCellBackgroundColor(newCell, cell);
}
return res;
}
NS_IMETHODIMP
@ -1775,6 +1786,7 @@ nsHTMLEditor::SplitCellIntoRows(nsIDOMElement *aTable, PRInt32 aRowIndex, PRInt3
nsIDOMElement **aNewCell)
{
if (!aTable) return NS_ERROR_NULL_POINTER;
if (aNewCell) *aNewCell = nsnull;
nsCOMPtr<nsIDOMElement> cell;
PRInt32 startRowIndex, startColIndex, rowSpan, colSpan, actualRowSpan, actualColSpan;
@ -1857,7 +1869,25 @@ nsHTMLEditor::SplitCellIntoRows(nsIDOMElement *aTable, PRInt32 aRowIndex, PRInt3
res = SetRowSpan(cell, aRowSpanAbove);
if (NS_FAILED(res)) return res;
res = InsertCell(cell2, aRowSpanBelow, actualColSpan, insertAfter, PR_FALSE, aNewCell);
// Insert new cell after using the remaining span
// and always get the new cell so we can copy the background color;
nsCOMPtr<nsIDOMElement> newCell;
res = InsertCell(cell2, aRowSpanBelow, actualColSpan, insertAfter, PR_FALSE, getter_AddRefs(newCell));
if (NS_FAILED(res)) return res;
if (newCell)
{
if (aNewCell)
{
*aNewCell = newCell.get();
NS_ADDREF(*aNewCell);
}
res = CopyCellBackgroundColor(newCell, cell2);
}
return res;
if (NS_FAILED(res)) return res;
return CopyCellBackgroundColor(*aNewCell, cell);
@ -1899,7 +1929,7 @@ nsHTMLEditor::SwitchTableCellHeaderType(nsIDOMElement *aSourceCell, nsIDOMElemen
if (aNewCell)
{
nsCOMPtr<nsIDOMElement> newElement = do_QueryInterface(newNode);
*aNewCell = newElement;
*aNewCell = newElement.get();
NS_ADDREF(*aNewCell);
}

47
editor/ui/composer/content/editor.js
Просмотреть файл

@ -869,32 +869,49 @@ function SetEditMode(mode)
if (!SetDisplayMode(mode))
return;
var source;
if (mode == DisplayModeSource)
{
// Get the entire document's source string
var source = editorShell.GetContentsAs("text/html", 0);
if (source.length > 0)
{
// Don't include anything before "<head", such as "<DOCTYPE..."
headStart = source.indexOf("<head");
if (headStart > 0)
gSourceContentWindow.value = source.slice(headStart);
else
headStart = source;
var flags = gOutputNoDoctype | gOutputEncodeEntities;
//
var prettyPrint = gPrefs.GetBoolPref("editor.prettyprint");
if (prettyPrint)
flags |= gOutputFormatted;
source = editorShell.GetContentsAs("text/html", flags);
var start = source.search(/<html/i);
if (start == -1) start = 0;
gSourceContentWindow.value = source.slice(start);
gSourceContentWindow.focus();
}
else
SetDisplayMode(PreviousNonSourceDisplayMode);
}
else if (previousMode == DisplayModeSource)
{
// We are comming from edit source mode,
// so transfer that back into the document
editorShell.RebuildDocumentFromSource(gSourceContentWindow.value);
source = gSourceContentWindow.value;
editorShell.RebuildDocumentFromSource(source);
// Clear out the source editor buffer
gSourceContentWindow.value = "";
// Must handle <title> here to make sure new value is updated
// everwhere (also covers bug in RebuildDocumentFromSource that strips it out!)
var titleStart = source.search(/<title>/i);
if (titleStart != -1)
{
// Skip over tag name
titleStart += 7;
var titleEnd = source.indexOf("<",titleStart);
if (titleEnd > titleStart)
{
var title = source.slice(titleStart, titleEnd);
dump("Title="+title+"|\n");
editorShell.SetDocumentTitle(title);
}
}
// Clear out the string buffers
source = null;
gSourceContentWindow.value = null;
// reset selection to top of doc (wish we could preserve it!)
if (bodyNode)