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

Bug 110388: Enhancements and bugfixes to viewsource. r=bz, sr=rbs.

This commit is contained in:
smontagu%netscape.com 2002-08-20 17:29:16 +00:00
Родитель bd67e26749
Коммит 8a7467d13c
2 изменённых файлов: 26 добавлений и 18 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

20
htmlparser/src/nsViewSourceHTML.cpp
Просмотреть файл

@ -489,18 +489,17 @@ nsresult CViewSourceHTML::WillBuildModel(const CParserContext& aParserContext,
#ifdef DUMP_TO_FILE #ifdef DUMP_TO_FILE
if (gDumpFile) { if (gDumpFile) {
nsCAutoString filename;
filename.AssignWithConversion(mFilename);
fprintf(gDumpFile, "<html>\n"); fprintf(gDumpFile, "<html>\n");
fprintf(gDumpFile, "<head>\n"); fprintf(gDumpFile, "<head>\n");
fprintf(gDumpFile, "<title>"); fprintf(gDumpFile, "<title>");
fprintf(gDumpFile, "Source of: "); fprintf(gDumpFile, "Source of: ");
fprintf(gDumpFile, filename); fputs(NS_ConvertUCS2toUTF8(mFilename).get(), gDumpFile);
fprintf(gDumpFile, "</title>\n"); fprintf(gDumpFile, "</title>\n");
fprintf(gDumpFile, "<link rel=\"stylesheet\" type=\"text/css\" href=\"resource:/res/viewsource.css\">\n"); fprintf(gDumpFile, "<link rel=\"stylesheet\" type=\"text/css\" href=\"resource:/res/viewsource.css\">\n");
fprintf(gDumpFile, "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n");
fprintf(gDumpFile, "</head>\n"); fprintf(gDumpFile, "</head>\n");
fprintf(gDumpFile, "<body>\n"); fprintf(gDumpFile, "<body id=\"viewsource\">\n");
fprintf(gDumpFile, "<pre>\n"); fprintf(gDumpFile, "<pre>\n");
} }
#endif //DUMP_TO_FILE #endif //DUMP_TO_FILE
@ -551,8 +550,15 @@ NS_IMETHODIMP CViewSourceHTML::BuildModel(nsIParser* aParser,nsITokenizer* aToke
nsCParserNode headNode(&headToken, 0/*stack token*/); nsCParserNode headNode(&headToken, 0/*stack token*/);
mSink->OpenHead(headNode); mSink->OpenHead(headNode);
// Note that XUL with automatically add the prefix "Source of: " // Note that XUL will automatically add the prefix "Source of: "
if (Substring(mFilename, 0, 5).Equals(NS_LITERAL_STRING("data:")) &&
mFilename.Length() > 50) {
nsAutoString dataFilename(Substring(mFilename, 0, 50));
dataFilename.Append(NS_LITERAL_STRING("..."));
mSink->SetTitle(dataFilename);
} else {
mSink->SetTitle(mFilename); mSink->SetTitle(mFilename);
}
if (theAllocator) { if (theAllocator) {
tag.Assign(NS_LITERAL_STRING("LINK")); tag.Assign(NS_LITERAL_STRING("LINK"));
@ -980,9 +986,7 @@ nsresult CViewSourceHTML::WriteTag(PRInt32 aTagType,const nsAString & aText,PRIn
mSink->AddLeaf(theNode); mSink->AddLeaf(theNode);
#ifdef DUMP_TO_FILE #ifdef DUMP_TO_FILE
if (gDumpFile) { if (gDumpFile) {
nsCAutoString cstr; fputs(NS_ConvertUCS2toUTF8(aText).get(), gDumpFile);
cstr.AssignWithConversion(aText);
fprintf(gDumpFile, cstr);
} }
#endif // DUMP_TO_FILE #endif // DUMP_TO_FILE

20
parser/htmlparser/src/nsViewSourceHTML.cpp
Просмотреть файл

@ -489,18 +489,17 @@ nsresult CViewSourceHTML::WillBuildModel(const CParserContext& aParserContext,
#ifdef DUMP_TO_FILE #ifdef DUMP_TO_FILE
if (gDumpFile) { if (gDumpFile) {
nsCAutoString filename;
filename.AssignWithConversion(mFilename);
fprintf(gDumpFile, "<html>\n"); fprintf(gDumpFile, "<html>\n");
fprintf(gDumpFile, "<head>\n"); fprintf(gDumpFile, "<head>\n");
fprintf(gDumpFile, "<title>"); fprintf(gDumpFile, "<title>");
fprintf(gDumpFile, "Source of: "); fprintf(gDumpFile, "Source of: ");
fprintf(gDumpFile, filename); fputs(NS_ConvertUCS2toUTF8(mFilename).get(), gDumpFile);
fprintf(gDumpFile, "</title>\n"); fprintf(gDumpFile, "</title>\n");
fprintf(gDumpFile, "<link rel=\"stylesheet\" type=\"text/css\" href=\"resource:/res/viewsource.css\">\n"); fprintf(gDumpFile, "<link rel=\"stylesheet\" type=\"text/css\" href=\"resource:/res/viewsource.css\">\n");
fprintf(gDumpFile, "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n");
fprintf(gDumpFile, "</head>\n"); fprintf(gDumpFile, "</head>\n");
fprintf(gDumpFile, "<body>\n"); fprintf(gDumpFile, "<body id=\"viewsource\">\n");
fprintf(gDumpFile, "<pre>\n"); fprintf(gDumpFile, "<pre>\n");
} }
#endif //DUMP_TO_FILE #endif //DUMP_TO_FILE
@ -551,8 +550,15 @@ NS_IMETHODIMP CViewSourceHTML::BuildModel(nsIParser* aParser,nsITokenizer* aToke
nsCParserNode headNode(&headToken, 0/*stack token*/); nsCParserNode headNode(&headToken, 0/*stack token*/);
mSink->OpenHead(headNode); mSink->OpenHead(headNode);
// Note that XUL with automatically add the prefix "Source of: " // Note that XUL will automatically add the prefix "Source of: "
if (Substring(mFilename, 0, 5).Equals(NS_LITERAL_STRING("data:")) &&
mFilename.Length() > 50) {
nsAutoString dataFilename(Substring(mFilename, 0, 50));
dataFilename.Append(NS_LITERAL_STRING("..."));
mSink->SetTitle(dataFilename);
} else {
mSink->SetTitle(mFilename); mSink->SetTitle(mFilename);
}
if (theAllocator) { if (theAllocator) {
tag.Assign(NS_LITERAL_STRING("LINK")); tag.Assign(NS_LITERAL_STRING("LINK"));
@ -980,9 +986,7 @@ nsresult CViewSourceHTML::WriteTag(PRInt32 aTagType,const nsAString & aText,PRIn
mSink->AddLeaf(theNode); mSink->AddLeaf(theNode);
#ifdef DUMP_TO_FILE #ifdef DUMP_TO_FILE
if (gDumpFile) { if (gDumpFile) {
nsCAutoString cstr; fputs(NS_ConvertUCS2toUTF8(aText).get(), gDumpFile);
cstr.AssignWithConversion(aText);
fprintf(gDumpFile, cstr);
} }
#endif // DUMP_TO_FILE #endif // DUMP_TO_FILE