paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-28 21:38:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

wiki: Fix PageHistory in wikisearchdemo.

Browse Source 
git-svn-id: trunk@49436 -
This commit is contained in:
wp 2015-06-24 17:33:05 +00:00
parent 8ab80a7904
commit c65d9574ef
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/wiki/test/wikisearchmain.pas
View File

@ -611,10 +611,9 @@ begin
end; end;
end else if Anchor<>'' then begin end else if Anchor<>'' then begin
// same page // same page
// PageIpHtmlPanel.MakeAnchorVisible(Anchor+'/'); // ipHTML stores anchor names with / at end // PageIpHtmlPanel.MakeAnchorVisible(Anchor+'/'); // ipHTML stores anchor names with / at end
PageIpHtmlPanel.MakeAnchorVisible(Anchor); // ... not any longer, fixed in r49421 PageIpHtmlPanel.MakeAnchorVisible(Anchor); // ... not any longer, fixed in r49421
end else begin FPageAnchor := Anchor;
exit;
end; end;
if AddToHistory and (FPageDocumentName<>'') then begin if AddToHistory and (FPageDocumentName<>'') then begin
PageHistory.AddAfterCurrent(FPageDocumentName,FPageAnchor,FPageTitle); PageHistory.AddAfterCurrent(FPageDocumentName,FPageAnchor,FPageTitle);
@ -654,9 +653,9 @@ begin
NewHTML:=TIpHtml.Create; // Beware: Will be freed automatically by IpHtmlPanel NewHTML:=TIpHtml.Create; // Beware: Will be freed automatically by IpHtmlPanel
Target.SetHtml(NewHTML); Target.SetHtml(NewHTML);
NewHTML.LoadFromStream(aStream); NewHTML.LoadFromStream(aStream);
// ToDo: fix TIpHtmlNodeA.MakeVisible, the areas are all 0,0,0,0 at this time
if Anchor<>'' then if Anchor<>'' then
Target.MakeAnchorVisible(Anchor+'/'); // ipHTML stores anchor names with / at end //Target.MakeAnchorVisible(Anchor+'/'); // ipHTML stores anchor names with / at end
Target.MakeAnchorVisible(Anchor); // ... not any longer, fixed in r49421
except except
on E: Exception do begin on E: Exception do begin
debugln(['TWikiSearchDemoForm.LoadHTML ',E.Message]); debugln(['TWikiSearchDemoForm.LoadHTML ',E.Message]);