From 6faea6c524890cf818b5b0d5047acaef00836d01 Mon Sep 17 00:00:00 2001 From: Jonatan Liljedahl Date: Fri, 6 Jan 2012 23:47:04 +0100 Subject: [PATCH] Quarks-help: use Quark-openHelpFile (cherry picked from commit 378e94df17e8e73924ca87044d554b86c118ebeb) --- SCClassLibrary/Common/Quarks/Quark.sc | 5 ++++- SCClassLibrary/Common/Quarks/Quarks.sc | 12 ++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/SCClassLibrary/Common/Quarks/Quark.sc b/SCClassLibrary/Common/Quarks/Quark.sc index aae094d2c..5798277d3 100644 --- a/SCClassLibrary/Common/Quarks/Quark.sc +++ b/SCClassLibrary/Common/Quarks/Quark.sc @@ -133,7 +133,10 @@ Quark } openHelpFile { var p = info.helpdoc; - if(p.isNil) {^nil}; + if(p.isNil) { + ("No primary helpdoc listed for Quark"+name).inform; + ^nil + }; case {p.endsWith(".html")} { HelpBrowser.goTo(HelpBrowser.getOldWrapUrl(parent.local.path +/+ path +/+ p)) diff --git a/SCClassLibrary/Common/Quarks/Quarks.sc b/SCClassLibrary/Common/Quarks/Quarks.sc index 7a52bb2f9..e20640ea3 100644 --- a/SCClassLibrary/Common/Quarks/Quarks.sc +++ b/SCClassLibrary/Common/Quarks/Quarks.sc @@ -234,7 +234,7 @@ Quarks } help { |name| - var q, helpdoc, path; + var q; q = local.findQuark(name); if(q.isNil,{ @@ -244,15 +244,7 @@ Quarks ).throw; }); - helpdoc = q.info.helpdoc; - - if(helpdoc.isNil, { - ("No primary helpdoc listed for Quark"+name).inform; - }, { - path = Quarks.local.path.select{|c| (c != $\\)} - +/+ q.path +/+ helpdoc; - Document.open(path); - }); + q.openHelpFile; } name { ^local.name } -- 2.11.4.GIT