X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=doc%2Fsalome%2Fgui%2FSMESH%2Fwhihost.js;h=9aaf13a6a58483b1e15effca8b7f79775caccbba;hb=f54ea61edf7a0e6f48091cd0f3b380c195bffc7e;hp=7e2ab32d51199ca52e71db20af6bd6369c753ab9;hpb=409b861ea153ec9f8ed69ec02512a9c4d9730329;p=modules%2Fsmesh.git

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