--- a/ActiveHelp.st Thu Dec 22 18:41:12 2005 +0100
+++ b/ActiveHelp.st Mon Jan 09 09:52:13 2006 +0100
@@ -403,6 +403,9 @@
|model app1 app2 text view v sv topView|
+ text := self helpTextFromView:aView at:aPointOrNil.
+ text notNil ifTrue:[ ^ text ].
+
view := aView.
((aView respondsTo:#application)
@@ -469,15 +472,14 @@
aPointOrNil notNil ifTrue:[
(aModel respondsTo:#helpTextFor:at:) ifTrue:[
text := aModel helpTextFor:aView at:aPointOrNil.
+ text notNil ifTrue:[^ text].
].
].
- text isNil ifTrue:[
- (aModel respondsTo:#helpTextFor:) ifTrue:[
- text := aModel helpTextFor:aView.
- text notNil ifTrue:[
- text2 := self helpTextFromView:aView at:aPointOrNil.
- text2 notNil ifTrue:[ ^ text2 ].
- ].
+ (aModel respondsTo:#helpTextFor:) ifTrue:[
+ text := aModel helpTextFor:aView.
+ text notNil ifTrue:[
+ text2 := self helpTextFromView:aView at:aPointOrNil.
+ text2 notNil ifTrue:[ ^ text2 ].
].
].
^ text
@@ -683,7 +685,7 @@
!ActiveHelp class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview2/ActiveHelp.st,v 1.55 2004-06-22 07:38:14 ca Exp $'
+ ^ '$Header: /cvs/stx/stx/libview2/ActiveHelp.st,v 1.56 2006-01-09 08:52:13 cg Exp $'
! !
ActiveHelp initialize!