*** empty log message ***

[modules/smesh.git] / doc / salome / gui / SMESH / whihost.js

diff --git a/doc/salome/gui/SMESH/whihost.js b/doc/salome/gui/SMESH/whihost.js
index 7e2ab32d51199ca52e71db20af6bd6369c753ab9..9aaf13a6a58483b1e15effca8b7f79775caccbba 100755 (executable)
--- a/doc/salome/gui/SMESH/whihost.js
+++ b/doc/salome/gui/SMESH/whihost.js
@@ -1,3 +1,4 @@
+//     WebHelp 5.10.002\r
 var gsDefaultTarget="bsscright";\r
 var gsBgColor="#ffffff";\r
 var gsBgImage="";\r
@@ -76,7 +77,7 @@ function writeOneItem(oHTML,bDown,aDataCon,aCurIdxSet,nLength,aPos,nLevel)
                        for(var i=0;i<nLength;i++)\r
                                sTopics+=getIdxTopics(aDataCon,aCurIdxSet[i],aPos[aCurIdxSet[i]]);\r
                        sHTML+="<p style=\"margin-left:"+gsIdxIndent+"\"><nobr>";\r
-                       sHTML+="<a alt=\"" + sKName + "\" href=\"javascript:void(0);\" onfocus=\"clearHighLight();\" onclick=\"PopupMenu_Invoke(event,'"+getTargetName(aDataCon,nIdxSet,nIIdx)+"'";\r
+                       sHTML+="<a alt=\"" + sKName + "\" href=\"javascript:void(0);\" onfocus=\"clearHighLight();\" onclick=\"PopupMenu_Invoke(event,'"+excapeSingleQuotandSlash(getTargetName(aDataCon,nIdxSet,nIIdx))+"'";\r
                        if(sTopics.length>0)\r
                                sHTML+=sTopics+");return false;\">"+sKName+"</a></nobr></p>";\r
                        else\r
@@ -91,7 +92,7 @@ function writeOneItem(oHTML,bDown,aDataCon,aCurIdxSet,nLength,aPos,nLevel)
                        sHTML+="<h6 class=\"firstsub\" style=\"margin-left:"+nIndent+"pt\"><nobr>";\r
                else\r
                        sHTML+="<h6 style=\"margin-left:"+nIndent+"pt\"><nobr>";\r
-               sHTML+="<a alt=\"" + sKName + "\" href=\"javascript:void(0);\" onfocus=\"clearHighLight();\" onclick=\"PopupMenu_Invoke(event,'"+getTargetName(aDataCon,nIdxSet,nIIdx)+"'";\r
+               sHTML+="<a alt=\"" + sKName + "\" href=\"javascript:void(0);\" onfocus=\"clearHighLight();\" onclick=\"PopupMenu_Invoke(event,'"+excapeSingleQuotandSlash(getTargetName(aDataCon,nIdxSet,nIIdx))+"'";\r
                if(sTopics.length>0)\r
                        sHTML+=sTopics+");return false;\">"+sKName+"</a></nobr></h6>";\r
                else\r
@@ -217,7 +218,7 @@ function loadIdx()
                                var sLangId=aProj[0].sLangId;\r
                                for(var i=0;i<aProj.length;i++)\r
                                {\r
-                                       if(aProj[i].sIdx!=null&&aProj[i].sIdx!=""&&aProj[i].sLangId==sLangId)\r
+                                       if(aProj[i].sIdx&&aProj[i].sLangId==sLangId)\r
                                        {\r
                                                addProjInfo(aProj[i].sPPath,aProj[i].sDPath,aProj[i].sIdx);\r
                                        }\r
@@ -243,22 +244,13 @@ function getIdxTopics(aDataCon,nIdxSet,nIIdx)
                        {\r
                                var sURL=aDataCon[nIdxSet].aKs[nIIdx].aTopics[i].sURL;\r
                                var sFullPath=_getFullPath(sPath,sURL);\r
-                               sTopics+=",'"+excapeSingleQuot(_textToHtml(aDataCon[nIdxSet].aKs[nIIdx].aTopics[i].sName))+"','"+_textToHtml_nonbsp(sFullPath)+"'";\r
+                               sTopics+=",'"+excapeSingleQuotandSlash(_textToHtml(aDataCon[nIdxSet].aKs[nIIdx].aTopics[i].sName))+"','"+excapeSingleQuotandSlash(_textToHtml_nonbsp(sFullPath))+"'";\r
                        }\r
                }\r
        }\r
        return sTopics;         \r
 }\r
 \r
-function excapeSingleQuot(str)\r
-{\r
-       if(str==null) return null;\r
-       var sRes=str;\r
-       var re=new RegExp("'","g");\r
-       sRes=sRes.replace(re,"\\'");\r
-       return sRes;\r
-}\r
-\r
 function findCKInDom()\r
 {\r
        if(gsCK!=null)\r