Skip to content
Snippets Groups Projects
Commit 8c9d4a36 authored by srosse's avatar srosse
Browse files

Merge OpenOLAT 10.2 to OpenOLAT default branch with 3b9ecf0af036b5c5023253dada66a0c80b013641

parents 73477a84 88ab2b30
No related branches found
No related tags found
No related merge requests found
...@@ -107,3 +107,4 @@ af70cba43e63c869157b900f2a0d8bda7e0900d8 OpenOLAT 10.2.1 ...@@ -107,3 +107,4 @@ af70cba43e63c869157b900f2a0d8bda7e0900d8 OpenOLAT 10.2.1
d439e94e9a8f99fbfe9a0e61720189185dde1ba1 OpenOLAT 10.2.1 d439e94e9a8f99fbfe9a0e61720189185dde1ba1 OpenOLAT 10.2.1
3003411d7470026b202274abecd2e65c012c9b96 OpenOLAT 10.2.2 3003411d7470026b202274abecd2e65c012c9b96 OpenOLAT 10.2.2
12a83272ceab2dec4ba03903e90a7cddd6cffc2c OpenOLAT 10.2.3 12a83272ceab2dec4ba03903e90a7cddd6cffc2c OpenOLAT 10.2.3
dddaecac3f7ad507a77d5d2df5ded499b06baf0f OpenOLAT 10.2.4
...@@ -315,7 +315,7 @@ function getHighlightStartTag(glossaryMainTerm, searchTerm, occurrence){ ...@@ -315,7 +315,7 @@ function getHighlightStartTag(glossaryMainTerm, searchTerm, occurrence){
searchTerm = searchTerm.replace(" ","+"); searchTerm = searchTerm.replace(" ","+");
var identifier = "gloss" + glossaryMainTerm + "" + searchTerm + "" + occurrence ; var identifier = "gloss" + glossaryMainTerm + "" + searchTerm + "" + occurrence ;
identifier = mainwindow.o_gloss_getUniqueTargetId(identifier); identifier = mainwindow.o_gloss_getUniqueTargetId(identifier);
highlightStartTag = "<span class=\"o_tm_glossary\" id=\"" + identifier + "\">"; highlightStartTag = "<span class='o_tm_glossary' id='" + identifier + "'>";
//to later know, which ext-tooltips should be added. //to later know, which ext-tooltips should be added.
var tmpArr = new Array(glossaryMainTerm,searchTerm,occurrence); var tmpArr = new Array(glossaryMainTerm,searchTerm,occurrence);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment