Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

23485: make it possible for urlbar to go to urls spanning multiple lines. r=jfrancis

Browse Source
This commit is contained in:
akkana%netscape.com 2000-08-28 22:15:03 +00:00
parent 90b2424793
commit d9d40942bd
5 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docshell/base/nsDocShell.cpp
View File

@ -2838,6 +2838,9 @@ NS_IMETHODIMP nsDocShell::CreateFixupURI(const PRUnichar* aStringURI,
nsAutoString uriString(aStringURI);
uriString.Trim(" "); // Cleanup the empty spaces that might be on each end.
// Eliminate embedded newlines, which single-line text fields now allow:
uriString.StripChars("\r\n");
// XXX nasty hack to check for the view-source: prefix
//
// The long term way and probably CORRECT way to do this is to write a

2
editor/base/nsEditorShell.cpp
View File

@ -4424,7 +4424,7 @@ nsEditorShell::GetEmbeddedObjects(nsISupportsArray **aObjectArray)
if (!aObjectArray)
return NS_ERROR_NULL_POINTER;
nsresult result;
nsresult result = NS_NOINTERFACE;
switch (mEditorType)
{

12
editor/base/nsTextEditRules.cpp
View File

@ -69,10 +69,10 @@ NS_NewTextEditRules(nsIEditRules** aInstancePtrResult)
nsTextEditRules::nsTextEditRules()
: mEditor(nsnull)
, mFlags(0) // initialized to 0 ("no flags set"). Real initial value is given in Init()
, mPasswordText()
, mBogusNode(nsnull)
, mBody(nsnull)
, mFlags(0) // initialized to 0 ("no flags set"). Real initial value is given in Init()
, mActionNesting(0)
, mLockRulesSniffing(PR_FALSE)
, mTheAction(0)
@ -603,8 +603,6 @@ nsTextEditRules::WillInsertText(PRInt32 aAction,
if (NS_FAILED(res)) return res;
}
char specialChars[] = {'\t','\n',0};
// if the selection isn't collapsed, delete it.
PRBool bCollapsed;
res = aSelection->GetIsCollapsed(&bCollapsed);
@ -630,6 +628,8 @@ nsTextEditRules::WillInsertText(PRInt32 aAction,
if (NS_FAILED(res)) return res;
}
#ifdef REPLACE_LINEBREAK_WITH_SPACES
// Commented out per bug 23485
// if we're a single line control, pretreat the input string to remove returns
// this is unnecessary if we use <BR>'s for breaks in "plain text", because
// InsertBreak() checks the string. But we don't currently do that, so we need this
@ -640,6 +640,7 @@ nsTextEditRules::WillInsertText(PRInt32 aAction,
{
outString->ReplaceChar(CRLF, ' ');
}
#endif /* REPLACE_LINEBREAK_WITH_SPACES */
// get the (collapsed) selection location
res = mEditor->GetStartNodeAndOffset(aSelection, &selNode, &selOffset);
@ -710,7 +711,10 @@ nsTextEditRules::WillInsertText(PRInt32 aAction,
// is it a return?
if (subStr.EqualsWithConversion("\n"))
{
res = mEditor->CreateBRImpl(&curNode, &curOffset, &unused, nsIEditor::eNone);
if (nsIHTMLEditor::eEditorSingleLineMask & mFlags)
res = mEditor->InsertTextImpl(subStr, &curNode, &curOffset, doc);
else
res = mEditor->CreateBRImpl(&curNode, &curOffset, &unused, nsIEditor::eNone);
pos++;
}
else

2
editor/composer/src/nsEditorShell.cpp
View File

@ -4424,7 +4424,7 @@ nsEditorShell::GetEmbeddedObjects(nsISupportsArray **aObjectArray)
if (!aObjectArray)
return NS_ERROR_NULL_POINTER;
nsresult result;
nsresult result = NS_NOINTERFACE;
switch (mEditorType)
{

12
editor/libeditor/text/nsTextEditRules.cpp
View File

@ -69,10 +69,10 @@ NS_NewTextEditRules(nsIEditRules** aInstancePtrResult)
nsTextEditRules::nsTextEditRules()
: mEditor(nsnull)
, mFlags(0) // initialized to 0 ("no flags set"). Real initial value is given in Init()
, mPasswordText()
, mBogusNode(nsnull)
, mBody(nsnull)
, mFlags(0) // initialized to 0 ("no flags set"). Real initial value is given in Init()
, mActionNesting(0)
, mLockRulesSniffing(PR_FALSE)
, mTheAction(0)
@ -603,8 +603,6 @@ nsTextEditRules::WillInsertText(PRInt32 aAction,
if (NS_FAILED(res)) return res;
}
char specialChars[] = {'\t','\n',0};
// if the selection isn't collapsed, delete it.
PRBool bCollapsed;
res = aSelection->GetIsCollapsed(&bCollapsed);
@ -630,6 +628,8 @@ nsTextEditRules::WillInsertText(PRInt32 aAction,
if (NS_FAILED(res)) return res;
}
#ifdef REPLACE_LINEBREAK_WITH_SPACES
// Commented out per bug 23485
// if we're a single line control, pretreat the input string to remove returns
// this is unnecessary if we use <BR>'s for breaks in "plain text", because
// InsertBreak() checks the string. But we don't currently do that, so we need this
@ -640,6 +640,7 @@ nsTextEditRules::WillInsertText(PRInt32 aAction,
{
outString->ReplaceChar(CRLF, ' ');
}
#endif /* REPLACE_LINEBREAK_WITH_SPACES */
// get the (collapsed) selection location
res = mEditor->GetStartNodeAndOffset(aSelection, &selNode, &selOffset);
@ -710,7 +711,10 @@ nsTextEditRules::WillInsertText(PRInt32 aAction,
// is it a return?
if (subStr.EqualsWithConversion("\n"))
{
res = mEditor->CreateBRImpl(&curNode, &curOffset, &unused, nsIEditor::eNone);
if (nsIHTMLEditor::eEditorSingleLineMask & mFlags)
res = mEditor->InsertTextImpl(subStr, &curNode, &curOffset, doc);
else
res = mEditor->CreateBRImpl(&curNode, &curOffset, &unused, nsIEditor::eNone);
pos++;
}
else