Skip to content
Snippets Groups Projects
Commit 4c1c425f authored by srosse's avatar srosse
Browse files

OO-531: glossar up and running

parent c338bc3b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 47 additions and 120 deletions
src/main/java/org/olat/core/gui/control/generic/iframe/IFrameDeliveryMapper.java
+ 11
− 25
View file @ 4c1c425f
......@@ -299,40 +299,26 @@ public class IFrameDeliveryMapper implements Mapper, Serializable {
log.debug("Textmarking is enabled, including tooltips js files into iframe source...");
}
sb.append("\n<script type=\"text/javascript\" src=\"");
StaticMediaDispatcher.renderStaticURI(sb, "js/prototype/prototype.js");
sb.append("\"></script>");
sb.append("\n<script type=\"text/javascript\" src=\"");
StaticMediaDispatcher.renderStaticURI(sb, "js/ext/adapter/prototype/ext-prototype-adapter.js");
sb.append("\"></script>");
sb.append("\n<link rel=\"stylesheet\" type=\"text/css\" href=\"");
StaticMediaDispatcher.renderStaticURI(sb, "js/ext/resources/css/ext-all.css");
sb.append("\"");
if (docType != null && docType.indexOf("XHTML") > 0) sb.append("/"); // close tag only when xhtml to validate
// Loading ExtJS minimalisic, only what's needed for the quick tips
sb.append(">\n<script type=\"text/javascript\" src=\"");
StaticMediaDispatcher.renderStaticURI(sb, "js/ext/pkgs/ext-core.js");
sb.append("\"></script>");
sb.append("\n<script type=\"text/javascript\" src=\"");
StaticMediaDispatcher.renderStaticURI(sb, "js/ext/pkgs/ext-foundation.js");
sb.append("\"></script>");
sb.append("\n<script type=\"text/javascript\" src=\"");
StaticMediaDispatcher.renderStaticURI(sb, "js/ext/pkgs/cmp-foundation.js");
sb.append("\"></script>");
sb.append("\n<script type=\"text/javascript\" src=\"");
StaticMediaDispatcher.renderStaticURI(sb, "js/ext/pkgs/ext-dd.js");
sb.append("\"></script>");
sb.append("\n<script type=\"text/javascript\" src=\"");
StaticMediaDispatcher.renderStaticURI(sb, "js/ext/pkgs/pkg-tips.js");
StaticMediaDispatcher.renderStaticURI(sb, "js/jquery/jquery-1.9.0.min.js");
sb.append("\"></script>\n<script type=\"text/javascript\" src=\"");
StaticMediaDispatcher.renderStaticURI(sb, "js/jquery/jquery-migrate-1.0.0.min.js");
sb.append("\"></script>\n<script type=\"text/javascript\" src=\"");
StaticMediaDispatcher.renderStaticURI(sb, "js/jshashtable-2.1_src.js");
sb.append("\"></script>\n<script type=\"text/javascript\" src=\"");
StaticMediaDispatcher.renderStaticURI(sb, "js/jquery/jquery-ui-1.10.0.custom.min.js");
sb.append("\"></script>");
// Load glossary code now
sb.append("\n<script type=\"text/javascript\" id=\"textmarkerLib\" src=\"");
sb.append(textMarkerPath) ;
sb.append("/js/glossaryhighlighter.js");
sb.append("\"></script>");
sb.append("\n<link rel=\"stylesheet\" type=\"text/css\" id=\"textmarkercss\" href=\"")
.append(textMarkerPath).append("/css/textmarker.css\"");
if (docType != null && docType.indexOf("XHTML") > 0) sb.append("/"); // close tag only when xhtml to validate
sb.append(">\n<link rel=\"stylesheet\" type=\"text/css\" id=\"jqueryiocss\" href=\"");
StaticMediaDispatcher.renderStaticURI(sb, "js/jquery/jquery-ui.css");
sb.append("\" ");
if (docType != null && docType.indexOf("XHTML") > 0) sb.append("/"); // close tag only when xhtml to validate
sb.append(">\n");
}
......
src/main/java/org/olat/core/gui/control/generic/textmarker/TextMarkerJsGenerator.java
+ 1
− 4
View file @ 4c1c425f
......@@ -76,10 +76,7 @@ public class TextMarkerJsGenerator {
ArrayList<String> allHighlightStrings = glossaryItem.getAllStringsToMarkup();
sb.append("new Array(\"");
for (Iterator<String> iterator2 = allHighlightStrings.iterator(); iterator2.hasNext();) {
String termFlexionSynonym = iterator2.next();
//fxdiff: FXOLAT-235 fix quotationsmarks that break the js code
termFlexionSynonym = StringEscapeUtils.escapeJava(termFlexionSynonym);
String termFlexionSynonym = StringEscapeUtils.escapeJava(iterator2.next());
sb.append(termFlexionSynonym);
sb.append("\"");
if (iterator2.hasNext()) {
......
src/main/java/org/olat/core/gui/control/generic/textmarker/_content/tmContainer.html
+ 1
− 1
View file @ 4c1c425f
......@@ -29,7 +29,7 @@ $r.render("tmComponent")
// do load
var url = b_glossaryTermMapperPath + "/" + glossaryId + "/terms.js";
jQuery.ajax(url, {
asynchronous : false,
async: false,
encoding : 'UTF-8', method : 'get',
success: function(data, textStatus, jqXHR) {
jQuery(document).data("o_glossaries")[glossaryId] = eval(jqXHR.responseText);
......
src/main/java/org/olat/core/gui/control/generic/textmarker/_static/js/glossaryhelper.js
+ 7
− 11
View file @ 4c1c425f
......@@ -40,21 +40,17 @@ function o_gloss_setLastActiveGlossary(glossaryId){
*
* March 2009 Roman Haag, roman.haag@frentix.com
*/
function o_gloss_getUniqueTargetId(targetId){
function o_gloss_getUniqueTargetId(targetId) {
var myhash = o_info["glosshash"];
if (myhash != null && myhash != undefined){
var hashnow = myhash.getEntryForKey(targetId);
} else {
var hashnow;
var hashnow = null;
if (myhash != null && myhash != undefined) {
hashnow = myhash.get(targetId);
}
if(hashnow == undefined){
debug ? console.log("hash->value not found for target: " + targetId): null;
if(hashnow == null) {
var uniqId = ((new Date()).getTime() + "" + Math.floor(Math.random() * 1000000)).substr(0, 18);
myhash.addEntry(targetId,uniqId);
myhash.put(targetId,uniqId);
}
return "o_gloss" + myhash.getEntryForKey(targetId);
return "o_gloss" + myhash.get(targetId);
}
src/main/java/org/olat/core/gui/control/generic/textmarker/_static/js/glossaryhighlighter.js
+ 26
− 68
View file @ 4c1c425f
......@@ -84,15 +84,11 @@ function o_tm_highlightFromArray(glossaryId, domId) {
debug ? console.log("running highlightFromArray(" + glossaryId + ", " + domId + ")") : null;
try {
//if(jQuery(document).ooLog().isDebugEnabled()) jQuery(document).ooLog('debug',"running highlightFromArray(" + glossaryId + ", " + domId + ")" ,"glossarymarker.js");
markerArray = new Array();
markerArray = eval(jQuery(document).data("o_glossaries")[glossaryId]);
// do the highlighting on the given dom element
o_tm_doHighlightAll(document, markerArray, domId);
} catch (e) {
// catch any exception that might happen and do nothing. just in case
// something unexpected happens, make sure the text marker code does not break
......@@ -106,8 +102,10 @@ function o_tm_highlightFromArray(glossaryId, domId) {
}
}
setTimeout(function() { b_AddOnDomReplacementFinishedUniqueCallback( new Array("glosshighlighter", GlossaryHighlightCallback.highlightAfterDomReplace) ); },0);
// b_AddOnDomReplacementFinishedUniqueCallback( function(){ workedOnDom = []; } );
setTimeout(function() {
b_AddOnDomReplacementFinishedUniqueCallback( new Array("glosshighlighter", GlossaryHighlightCallback.highlightAfterDomReplace) );
},0);
isExecuting = false;
}//isExecuting
......@@ -155,16 +153,7 @@ function o_tm_doHighlightAll(currentDocument, markerArray, domId) {
foundTerms = [];
foundTerms = new Array();
workedOnSpans = [];
//enable/disable to have a hash as cache
/* o_info["glosshash"] = [];
var myhash = null;
myhash = $H();
o_info["glosshash"] = myhash; */
//
var highlightString = "";
for (var i = 0; i < markerArray.length; i++) {
var allTerms = markerArray[i];
......@@ -209,65 +198,33 @@ function o_tm_doHighlightAll(currentDocument, markerArray, domId) {
*/
function o_tm_addExtToolTip(glossaryMainTerm, highlightString, occurrence){
try {
debug ? console.log("######### new tooltip for " + glossaryMainTerm + " and occurrence #" + occurrence + " of word " + highlightString): null;
debug ? console.log("Ext is ready: " + Ext.isReady): null;
var mapperPath = o_gloss_getDefinitionMapperPath() + "/" + o_gloss_getGlossaryId() + '/';
var targetId = 'gloss' + glossaryMainTerm + '' + highlightString + '' + occurrence;
targetId = mainwindow.o_gloss_getUniqueTargetId(targetId);
//prevent adding tip twice or more!
if (workedOnSpans.indexOf(targetId) == -1){
workedOnSpans.push(targetId);
var tipname = targetId + '_tip';
var tip = $(tipname)
debug ? console.log("existing tip: " + tip): null;
workedOnSpans.push(targetId);
var oldtip = Ext.getCmp(tipname);
debug ? console.log("old tip: " + oldtip): null;
if (oldtip) {
oldtip.destroy();
debug ? console.log("destroy tip!!"): null;
var oldtip_d = Ext.getCmp(tipname);
debug ? console.log("destroyed tip: " + oldtip_d): null;
}
var targetChk = $(targetId);
var targetChkExt = Ext.get(targetId);
debug ? console.log("targetChk : " + targetChkExt): null;
debug ? console.log("scope " + document.title): null;
if (targetChk){
debug ? console.log("tooltip for " + glossaryMainTerm + " and targetId " + targetId + " of path " + mapperPath): null;
targetChkExt.removeAllListeners();
var tip = jQuery('#' + targetId + '_tip');
var targetChk = jQuery('#' + targetId);
if (targetChk) {
Ext.Ajax.request({
url: mapperPath + glossaryMainTerm + '.html',
disableCaching: true,
success: function(response, opts) {
if(response.status == 200) {
new Ext.ToolTip({
target: targetId,
id: targetId + '_tip',
minWidth: 250,
dismissDelay: 0,
constrainPosition: true,
html: response.responseText
});
}
}
var glossUrl = mapperPath + glossaryMainTerm + '.html';
targetChk.tooltip({
items: '#' + targetId,
content: function(evt, ui) {
var elem = jQuery(this);
jQuery.ajax(glossUrl).always(function(data, textStatus, jqXHR) {
elem.tooltip('option', 'content', data).tooltip('open');
});
}
});
debug ? console.log("neutip ID: " + neutip.getId()): null;
debug ? console.log("target ev id after creating tip: " + targetChk._prototypeEventID): null;
}
} else {
debug ? console.log("already worked on " + targetId): null;
}
}
} catch(e) {
console.log("error: " + e);
}
catch(e){
debug ? console.log("error: " + e): null;
}
}
......@@ -280,7 +237,9 @@ function o_tm_addExtToolTip(glossaryMainTerm, highlightString, occurrence){
* August 2006 Florian Gnägi
*/
function o_tm_doHighlightSingle(bodyText, glossaryMainTerm, searchTerm) {
highlightEndTag = "</span>";
// find all occurences of the search term in the given text,
// and add some "highlight" tags to them (we're not using a
......@@ -295,10 +254,10 @@ function o_tm_doHighlightSingle(bodyText, glossaryMainTerm, searchTerm) {
var occurrence = 0;
// prevent highlighting in buggy IE when a movieplayer is used or in some TinyMCE-cases
// see OLAT-5447 for more infos
if(bodyText.indexOf('BGlossarIgnore') > 0 || ( Ext.isIE && bodyText.indexOf('olatFlashMovieViewer') > 0)) {
if(bodyText.indexOf('BGlossarIgnore') > 0 || (jQuery.browser.msie && bodyText.indexOf('olatFlashMovieViewer') > 0)) {
return bodyText;
}
while (bodyText.length > 0) {
i = lcBodyText.indexOf(lcSearchTerm, i+1);
// Finish when search term is not found
......@@ -322,6 +281,7 @@ function o_tm_doHighlightSingle(bodyText, glossaryMainTerm, searchTerm) {
|| char == ">" || char == "\"" || char == "'" || char == "`" || char == "(" || char == "[" || char == "{" || char == "-") )
continue;
}
if (lcBodyText.length > i + searchTerm.length) {
// check character right after the the search term
char = lcBodyText.charAt(i + searchTerm.length);
......@@ -349,11 +309,9 @@ function o_tm_doHighlightSingle(bodyText, glossaryMainTerm, searchTerm) {
lcBodyText = bodyText.toLowerCase();
i = -1;
}
return newText;
}
/*
* creates an identifier to use for highlighting
*
......
src/main/java/org/olat/modules/cp/CPPrintMapper.java
+ 1
− 11
View file @ 4c1c425f
......@@ -159,17 +159,7 @@ public class CPPrintMapper implements Mapper {
private void injectJavascriptAndCss(StringBuilder output) {
StringOutput sb = new StringOutput();
sb.append("\n<script type=\"text/javascript\" src=\"");
StaticMediaDispatcher.renderStaticURI(sb, "js/prototype/prototype.js");
sb.append("\"></script><script type=\"text/javascript\" src=\"");
StaticMediaDispatcher.renderStaticURI(sb, "js/ext/adapter/prototype/ext-prototype-adapter.js");
sb.append("\"></script><link rel=\"stylesheet\" type=\"text/css\" href=\"");
StaticMediaDispatcher.renderStaticURI(sb, "js/ext/resources/css/ext-all.css");
sb.append("\" /><script type=\"text/javascript\" src=\"");
StaticMediaDispatcher.renderStaticURI(sb, "js/ext/pkgs/ext-core.js");
sb.append("\"></script><script type=\"text/javascript\" src=\"");
StaticMediaDispatcher.renderStaticURI(sb, "js/ext/pkgs/ext-foundation.js");
sb.append("\"></script><script type=\"text/javascript\" src=\"");
StaticMediaDispatcher.renderStaticURI(sb, "js/ext/pkgs/cmp-foundation.js");
StaticMediaDispatcher.renderStaticURI(sb, "js/jquery/jquery-1.9.0.min.js");
sb.append("\"></script>");
output.append(sb.toString());
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment