Merge remote-tracking branch 'origin/OpenOLAT_12.5' into OpenOLAT_13.1

pom.xml

@@ -74,7 +74,7 @@
 		<version.selenium>3.13.0</version.selenium>
 		<version.drone>2.5.1</version.drone>
 		<activemq.version>5.15.8</activemq.version>
-		<qtiworks.version>1.0.11</qtiworks.version>
+		<qtiworks.version>1.0.12</qtiworks.version>
 
 	    <!-- properties for testing and Q&A -->
 	    <!-- by default no tests are executed so far (April 2011). Use appropriate profiles and properties on the command line -->

src/main/java/org/olat/course/nodes/en/EnrollmentManager.java

@@ -302,8 +302,10 @@ public class EnrollmentManager {
 			String name = (String)row[1];
 			String desc = (String)row[2];
 			if(StringHelper.containsNonWhitespace(desc) && descriptionMaxSize > 0) {
-				desc = FilterFactory.getHtmlTagsFilter().filter(desc);
-				desc = Formatter.truncate(desc, 256);
+				String asciiDesc = FilterFactory.getHtmlTagsFilter().filter(desc);
+				if(asciiDesc.length() > descriptionMaxSize) {
+					desc = Formatter.truncate(asciiDesc, descriptionMaxSize);
+				}
 			}
 
 			int maxParticipants = row[3] == null ? -1 : ((Number)row[3]).intValue();

src/main/java/org/olat/ims/qti21/ui/_content/assessment_results.html

@@ -504,6 +504,14 @@
 					jQuery('#collapse_${itemResult.interactionResults.solutionFormItem.name}').on('show.bs.collapse', function () {
 						jQuery('#collapse_${itemResult.interactionResults.solutionFormItem.name}_toggler').removeClass('o_icon_open_togglebox').addClass('o_icon_close_togglebox');
 					})
+					jQuery('#collapse_${itemResult.interactionResults.solutionFormItem.name}').on('shown.bs.collapse', function () {
+						jQuery('#collapse_${itemResult.interactionResults.solutionFormItem.name} canvas').each(function(index, el) {
+							var jEl = jQuery(el);
+							if(jEl.css('height') == '0px') {
+								jEl.css('height', jEl.attr('height') + "px");
+							}
+						});
+					})
 				});
 				/* ]]> */
 				</script>

src/main/webapp/static/js/tinymce4/tinymce/plugins/olatmatheditor/plugin.js

@@ -41,6 +41,7 @@
 		            ed.dom.setAttrib(contentNode, "data-mce-placeholder", "")
 		            ed.dom.setAttrib(contentNode, "title", escape(tex));
 		            ed.execCommand("mceRepaint");
+					ed.setDirty(true);
 		        } else {
 		        	var htmlCode = '<img src="' + tinymce.Env.transparentSrc + '" class="mce-shim mceItemJSMath" data-mce-placeholder="latex" data-mathtex="' + tex + '" title="' + escape(tex) + '" width="32" height="32"/>';
 		            ed.execCommand("mceInsertContent", false, htmlCode);
@@ -197,7 +198,7 @@
 				author : 'frentix GmbH',
 				authorurl : 'http://www.frentix.com',
 				infourl : 'http://www.frentix.com',
-				version : "1.2.1"
+				version : "1.2.2"
 			};
 		}
 	});

src/main/webapp/static/js/tinymce4/tinymce/plugins/olatmatheditor/plugin.min.js

-(function(){tinymce.create("org.olat.core.gui.components.form.flexible.impl.elements.richText.plugins.olatmatheditor",{init:function(b,d){var f;var g=window.MathJax;function c(){if(f){return f}var i=o_getMainWin();if(i){f=jQuery(document).ooTranslator().getTranslator(i.o_info.locale,"org.olat.core.gui.components.form.flexible.impl.elements.richText.plugins.olatmatheditor")}else{f={translate:function(j){return j}}}return f}function e(){var j=win.find("#latex")[0].value();var i=b.selection.getNode();if((i!=null)&&(/mceItemJSMath/.test(b.dom.getAttrib(i,"class")))){b.dom.setAttrib(i,"data-mathtex",j);b.dom.setAttrib(i,"data-mce-placeholder","");b.dom.setAttrib(i,"title",escape(j));b.execCommand("mceRepaint")}else{var k='<img src="'+tinymce.Env.transparentSrc+'" class="mce-shim mceItemJSMath" data-mce-placeholder="latex" data-mathtex="'+j+'" title="'+escape(j)+'" width="32" height="32"/>';b.execCommand("mceInsertContent",false,k)}}function h(){if(typeof g==="undefined"){o_mathjax(function(){g=window.MathJax;h()})}else{var i=win.find("#latex")[0].value();var j=g.Hub.getAllJax("mathpreviewFormula")[0];if(typeof j==="undefined"){g.Hub.Queue(function(){jQuery("#mathpreviewFormula .math").text(i);g.Hub.Typeset("#mathpreviewFormula")})}else{g.Hub.Queue(["Text",j,i])}}}function a(){win=b.windowManager.open({title:c().translate("olatmatheditor.formulaTabTitle"),minWidth:540,body:[{type:"container",layout:"flex",direction:"column",align:"stretch",padding:10,spacing:10,items:[{type:"label",text:c().translate("olatmatheditor.latexGroupTitle")},{name:"latex",type:"textbox",multiline:true,flex:1,minHeight:120,onkeyup:h},{name:"preview",type:"panel",label:"",flex:1,minHeight:120,html:'<div id="mathpreviewFormula" style="width:100%; height=100%;"><div class="math"></div></div><div id="mathpreviewErrorMessage"></div>'}]}],onSubmit:e});var j=b.selection.getNode();if((j.nodeName.toLowerCase()=="img")&&(j.className.indexOf("mceItemJSMath")>=0)){var i=jQuery(j).attr("data-mathtex");win.find("#latex")[0].value(i);h()}}b.addButton("olatmatheditor",{title:c().translate("olatmatheditor.desc"),icon:"math",stateSelector:["img[data-mathtex]","span[data-mathtex]"],onclick:a,onPostRender:function(){var i=this;b.on("NodeChange",function(j){var k=(j.element.nodeName=="IMG")&&(/mceItemJSMath/.test(b.dom.getAttrib(j.element,"class")));i.active(k);if(k){j.preventDefault(true);j.stopImmediatePropagation()}})}});b.addMenuItem("olatmatheditor",{text:c().translate("olatmatheditor.desc"),icon:"math",stateSelector:["img[data-mathtex]","span[data-mathtex]"],onclick:a,context:"insert",});b.on("init",function(){if(b.settings.content_css!==false){b.dom.loadCSS(d+"/css/content.css")}});b.on("LoadContent",function(i){tinymce.each(b.dom.select("span.math"),function(k){var l=k.innerHTML;var j=b.dom.create("img",{"class":"mce-shim mceItemJSMath",width:"32",height:"32",src:tinymce.Env.transparentSrc,"data-mathtex":l,"data-mce-placeholder":"latex",title:k.title});b.dom.replace(j,k)})});b.on("PreProcess",function(i){tinymce.each(b.dom.select("img.mceItemJSMath"),function(k){var j=b.dom.create("span",{"class":"math",title:k.title},jQuery(k).attr("data-mathtex"));b.dom.replace(j,k)})})},createControl:function(b,a){return null},getInfo:function(){return{longname:"OpenOLAT Math Editor",author:"frentix GmbH",authorurl:"http://www.frentix.com",infourl:"http://www.frentix.com",version:"1.2.1"}}});tinymce.PluginManager.add("olatmatheditor",org.olat.core.gui.components.form.flexible.impl.elements.richText.plugins.olatmatheditor)})();
\ No newline at end of file
+(function(){tinymce.create("org.olat.core.gui.components.form.flexible.impl.elements.richText.plugins.olatmatheditor",{init:function(b,d){var f;var g=window.MathJax;function c(){if(f){return f}var i=o_getMainWin();if(i){f=jQuery(document).ooTranslator().getTranslator(i.o_info.locale,"org.olat.core.gui.components.form.flexible.impl.elements.richText.plugins.olatmatheditor")}else{f={translate:function(j){return j}}}return f}function e(){var j=win.find("#latex")[0].value();var i=b.selection.getNode();if((i!=null)&&(/mceItemJSMath/.test(b.dom.getAttrib(i,"class")))){b.dom.setAttrib(i,"data-mathtex",j);b.dom.setAttrib(i,"data-mce-placeholder","");b.dom.setAttrib(i,"title",escape(j));b.execCommand("mceRepaint");b.setDirty(true)}else{var k='<img src="'+tinymce.Env.transparentSrc+'" class="mce-shim mceItemJSMath" data-mce-placeholder="latex" data-mathtex="'+j+'" title="'+escape(j)+'" width="32" height="32"/>';b.execCommand("mceInsertContent",false,k)}}function h(){if(typeof g==="undefined"){o_mathjax(function(){g=window.MathJax;h()})}else{var i=win.find("#latex")[0].value();var j=g.Hub.getAllJax("mathpreviewFormula")[0];if(typeof j==="undefined"){g.Hub.Queue(function(){jQuery("#mathpreviewFormula .math").text(i);g.Hub.Typeset("#mathpreviewFormula")})}else{g.Hub.Queue(["Text",j,i])}}}function a(){win=b.windowManager.open({title:c().translate("olatmatheditor.formulaTabTitle"),minWidth:540,body:[{type:"container",layout:"flex",direction:"column",align:"stretch",padding:10,spacing:10,items:[{type:"label",text:c().translate("olatmatheditor.latexGroupTitle")},{name:"latex",type:"textbox",multiline:true,flex:1,minHeight:120,onkeyup:h},{name:"preview",type:"panel",label:"",flex:1,minHeight:120,html:'<div id="mathpreviewFormula" style="width:100%; height=100%;"><div class="math"></div></div><div id="mathpreviewErrorMessage"></div>'}]}],onSubmit:e});var j=b.selection.getNode();if((j.nodeName.toLowerCase()=="img")&&(j.className.indexOf("mceItemJSMath")>=0)){var i=jQuery(j).attr("data-mathtex");win.find("#latex")[0].value(i);h()}}b.addButton("olatmatheditor",{title:c().translate("olatmatheditor.desc"),icon:"math",stateSelector:["img[data-mathtex]","span[data-mathtex]"],onclick:a,onPostRender:function(){var i=this;b.on("NodeChange",function(j){var k=(j.element.nodeName=="IMG")&&(/mceItemJSMath/.test(b.dom.getAttrib(j.element,"class")));i.active(k);if(k){j.preventDefault(true);j.stopImmediatePropagation()}})}});b.addMenuItem("olatmatheditor",{text:c().translate("olatmatheditor.desc"),icon:"math",stateSelector:["img[data-mathtex]","span[data-mathtex]"],onclick:a,context:"insert",});b.on("init",function(){if(b.settings.content_css!==false){b.dom.loadCSS(d+"/css/content.css")}});b.on("LoadContent",function(i){tinymce.each(b.dom.select("span.math"),function(k){var l=k.innerHTML;var j=b.dom.create("img",{"class":"mce-shim mceItemJSMath",width:"32",height:"32",src:tinymce.Env.transparentSrc,"data-mathtex":l,"data-mce-placeholder":"latex",title:k.title});b.dom.replace(j,k)})});b.on("PreProcess",function(i){tinymce.each(b.dom.select("img.mceItemJSMath"),function(k){var j=b.dom.create("span",{"class":"math",title:k.title},jQuery(k).attr("data-mathtex"));b.dom.replace(j,k)})})},createControl:function(b,a){return null},getInfo:function(){return{longname:"OpenOLAT Math Editor",author:"frentix GmbH",authorurl:"http://www.frentix.com",infourl:"http://www.frentix.com",version:"1.2.2"}}});tinymce.PluginManager.add("olatmatheditor",org.olat.core.gui.components.form.flexible.impl.elements.richText.plugins.olatmatheditor)})();
\ No newline at end of file