zydronium/screwturn-4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed #468: Formatter and ReverseFormatter now process inter-namespace links correctly.

Browse source
This commit is contained in:
Dario Solera 2010-01-27 13:01:09 +00:00
parent f8e410bf6a
commit c86aa2f318
4 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
AssemblyVersion.cs
View file

@ -16,5 +16,5 @@ using System.Reflection;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("3.0.1.462")] [assembly: AssemblyVersion("3.0.1.463")]
[assembly: AssemblyFileVersion("3.0.1.462")] [assembly: AssemblyFileVersion("3.0.1.463")]

3
Core/Formatter.cs
View file

@ -1761,7 +1761,8 @@ namespace ScrewTurn.Wiki {
} }
else { else {
targetUrl += Settings.PageExtension; targetUrl += Settings.PageExtension;
targetUrl = Tools.UrlEncode(targetUrl); // #468: Preserve ++ for ReverseFormatter
targetUrl = (bareBones && explicitNamespace ? "++" : "") + Tools.UrlEncode(targetUrl);
} }
string fullName = ""; string fullName = "";

2
Core/ReverseFormatter.cs
View file

@ -234,7 +234,7 @@ namespace ScrewTurn.Wiki {
string insertion = "["; string insertion = "[";
if(match.Groups[2].Value == @"target=""_blank"" ") insertion += "^"; if(match.Groups[2].Value == @"target=""_blank"" ") insertion += "^";
string decoded = UrlDecode(match.Groups[3].Value); string decoded = UrlDecode(match.Groups[3].Value);
insertion += decoded; insertion += (decoded.StartsWith(" ") ? "++" : "") + decoded.Trim();
if(match.Groups[6].Value != decoded) insertion += "|" + match.Groups[6].Value; if(match.Groups[6].Value != decoded) insertion += "|" + match.Groups[6].Value;
insertion += "]"; insertion += "]";
buffer.Insert(match.Index, insertion); buffer.Insert(match.Index, insertion);

18
WebApplication/PopupWYSIWYG.aspx.cs
View file

@ -150,13 +150,16 @@ namespace ScrewTurn.Wiki {
protected List<TreeElement> ctPages_Populate(object sender, PopulateEventArgs e) { protected List<TreeElement> ctPages_Populate(object sender, PopulateEventArgs e) {
List<TreeElement> result = new List<TreeElement>(100); List<TreeElement> result = new List<TreeElement>(100);
foreach(PageInfo pi in Pages.GetPages(Pages.FindNamespace(lstNamespace.SelectedValue))) {
NamespaceInfo selectedNamespace = Pages.FindNamespace(lstNamespace.SelectedValue);
NamespaceInfo currentNamespace = DetectNamespaceInfo();
foreach(PageInfo pi in Pages.GetPages(selectedNamespace)) {
PageContent cont = Content.GetPageContent(pi, true); PageContent cont = Content.GetPageContent(pi, true);
string formattedTitle = FormattingPipeline.PrepareTitle(cont.Title, false, FormattingContext.Other, pi); string formattedTitle = FormattingPipeline.PrepareTitle(cont.Title, false, FormattingContext.Other, pi);
string onClickJavascript = "javascript:"; string onClickJavascript = "javascript:";
// Populate the page title box if the title is different to the page name // Populate the page title box if the title is different to the page name
if (pi.FullName != cont.Title) if (pi.FullName != cont.Title) {
{
// Supply the page title to the Javascript that sets the page title on the page // Supply the page title to the Javascript that sets the page title on the page
// We can safely escape the \ character, but the " character is interpreted by the browser even if it is escaped to Javascript, so we can't allow it. // We can safely escape the \ character, but the " character is interpreted by the browser even if it is escaped to Javascript, so we can't allow it.
// The non-wysiwyg version escapes ' and replaces " with escaped ', but ' breaks the html insertion, so remove it altogether // The non-wysiwyg version escapes ' and replaces " with escaped ', but ' breaks the html insertion, so remove it altogether
@ -164,13 +167,12 @@ namespace ScrewTurn.Wiki {
// breaking the drop-down. // breaking the drop-down.
onClickJavascript += "SetValue('txtPageTitle', '" + cont.Title.Replace("\\", "\\\\").Replace("'", "").Replace("\"", "").Replace("<", "") + "');"; onClickJavascript += "SetValue('txtPageTitle', '" + cont.Title.Replace("\\", "\\\\").Replace("'", "").Replace("\"", "").Replace("<", "") + "');";
} }
else else {
{
onClickJavascript += "SetValue('txtPageTitle', '');"; onClickJavascript += "SetValue('txtPageTitle', '');";
} }
// Populate the page name // Populate the page name (#468: add ++ to all ReverseFormatter to work)
onClickJavascript += "return SetValue('txtPageName', '" + pi.FullName + "');"; onClickJavascript += "return SetValue('txtPageName', '" + (selectedNamespace != currentNamespace ? "++" : "") + pi.FullName + "');";
TreeElement item = new TreeElement(pi.FullName, formattedTitle, onClickJavascript); TreeElement item = new TreeElement((selectedNamespace != currentNamespace ? "++" : "") + pi.FullName, formattedTitle, onClickJavascript);
result.Add(item); result.Add(item);
} }
return result; return result;