The Trunk: HelpSystem-Core-mt.87.mcz

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

The Trunk: HelpSystem-Core-mt.87.mcz

commits-2
Marcel Taeumel uploaded a new version of HelpSystem-Core to project The Trunk:
http://source.squeak.org/trunk/HelpSystem-Core-mt.87.mcz

==================== Summary ====================

Name: HelpSystem-Core-mt.87
Author: mt
Time: 2 August 2016, 10:07:29.753882 am
UUID: ba6bc8ef-a866-df4f-802f-992894c957c7
Ancestors: HelpSystem-Core-nice.86

Fixes parsing of broken HTML a-href links as found in SWiki.

Fixes scroll-to-top when selecting new help topics.

=============== Diff against HelpSystem-Core-nice.86 ===============

Item was changed:
  ----- Method: HelpBrowser>>currentTopic: (in category 'accessing') -----
  currentTopic: aHelpTopic
 
  self okToChange ifFalse: [^ self].
  self currentTopic == aHelpTopic ifTrue: [^ self].
 
  currentTopic := aHelpTopic.
  topicPath := nil.
 
  self changed: #currentTopic.
+ self changed: #topicContents.
+ self changed: #showContents.!
- self changed: #topicContents.!

Item was changed:
  ----- Method: HtmlHelpTopic>>subtopicUrls (in category 'accessing') -----
  subtopicUrls
 
  ^ subtopicUrls ifNil: [
+ | start end endGuard |
- | start end |
  subtopicUrls := OrderedCollection new.
 
  start := self document findString: '<a '.
  start := self document findString: 'href' startingAt: start.
  [start > 0] whileTrue: [
  start := self document findString: '"' startingAt: start.
  end := self document findString: '"' startingAt: start+1.
+ endGuard := self document findString: '>' startingAt: start+1.
+ (end > 0 and: [end < endGuard])
+ ifTrue: [subtopicUrls addIfNotPresent: (self document copyFrom: start+1 to: end-1)].
- subtopicUrls addIfNotPresent: (self document copyFrom: start+1 to: end-1).
  start := self document findString: '<a ' startingAt: end+1.
  start > 0 ifTrue: [start := self document findString: 'href' startingAt: start]].
 
  subtopicUrls := subtopicUrls
  select: self selectBlock
  thenCollect: self convertBlock.
  subtopicUrls]!