Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as,v diff -u -r1.25 -r1.26 --- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as 7 Feb 2008 04:56:37 -0000 1.25 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as 11 Feb 2008 01:40:28 -0000 1.26 @@ -876,7 +876,7 @@ if(ca.activity.helpURL != undefined || ca.activity.helpURL != null) { Debugger.log("Opening help page with locale " + _root.lang + ": " + ca.activity.helpURL, Debugger.GEN, 'getHelp', 'Canvas'); - app.getHelpURL(Proxy.create(this, openHelp, ca)); + ApplicationParent.extCall("openURL", ca.activity.helpURL + app.module); } else { if (ca.activity.activityTypeID == Activity.GROUPING_ACTIVITY_TYPE){ @@ -894,16 +894,9 @@ } } - private function openHelp(url:String, ca:CanvasActivity){ - var newURL:String = app.addLocaleToURL(url) + ca.activity.toolSignature; - if(newURL != ca.activity.helpURL) ca.activity.helpURL = newURL; - - ApplicationParent.extCall("openURL", newURL + app.module); - } - private function openSystemToolHelp(url:String, toolSignature:String){ var target:String = toolSignature + app.module; - var newURL:String = app.addLocaleToURL(url); + var newURL:String = ApplicationParent.addLocaleToURL(url); ApplicationParent.extCall("openURL", newURL + target); } Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as,v diff -u -r1.11 -r1.12 --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as 7 Feb 2008 06:24:45 -0000 1.11 +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as 11 Feb 2008 01:40:28 -0000 1.12 @@ -491,7 +491,8 @@ if(ca.activity.helpURL != undefined || ca.activity.helpURL != null) { Debugger.log("Opening help page: " + ca.activity.helpURL + app.module, Debugger.GEN, 'getHelp', 'Monitor'); - app.getHelpURL(Proxy.create(this, openHelp, ca)); + + ApplicationParent.extCall("openURL", ca.activity.helpURL + app.module); } else { if (ca.activity.activityTypeID == Activity.GROUPING_ACTIVITY_TYPE){ var callback:Function = Proxy.create(this, openSystemToolHelp, Application.FLASH_TOOLSIGNATURE_GROUP); @@ -508,18 +509,9 @@ } } - private function openHelp(url:String, ca:CanvasActivity){ - var newURL:String = app.addLocaleToURL(url) + ca.activity.toolSignature; - if(newURL != ca.activity.helpURL) - ApplicationParent.extCall("openURL", newURL + app.module); - else - ApplicationParent.extCall("openURL", ca.activity.helpURL + app.module); - - } - private function openSystemToolHelp(url:String, toolSignature:String){ var target:String = toolSignature + app.module; - url = app.addLocaleToURL(url); + url = ApplicationParent.addLocaleToURL(url); ApplicationParent.extCall("openURL", url + target); }