Merge with 8ceef7d67239f202666d526b48600ecc841e58f3

.hgtags

@@ -187,3 +187,4 @@ ddfe863807617f21f6d75216bed144c791f5cab1 OpenOLAT 11.4.2
 25a2dc4dba8a7961ff4f19e33f709ddea5949141 OpenOLAT 11.4.3
 f0de363ab794a6e0d6f4d6da57f460503d5dfa91 OpenOLAT 11.5.0
 dda2b6a8c3454872516fac37667698425802fc97 OpenOLAT 11.5.1
+355d21cc46068ffa18c18c479efa6d402cb484ec OpenOLAT 11.5.2

src/main/java/org/olat/ims/qti21/ui/editor/interactions/FIBEditorController.java

@@ -24,6 +24,8 @@ import java.io.File;
 
 import org.apache.commons.lang.StringEscapeUtils;
 import org.cyberneko.html.parsers.SAXParser;
+import org.json.JSONException;
+import org.json.JSONObject;
 import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.components.form.flexible.FormItem;
 import org.olat.core.gui.components.form.flexible.FormItemContainer;
@@ -37,6 +39,7 @@ import org.olat.core.gui.control.Controller;
 import org.olat.core.gui.control.Event;
 import org.olat.core.gui.control.WindowControl;
 import org.olat.core.gui.control.generic.closablewrapper.CloseableModalController;
+import org.olat.core.gui.control.winmgr.Command;
 import org.olat.core.gui.control.winmgr.JSCommand;
 import org.olat.core.util.StringHelper;
 import org.olat.core.util.Util;
@@ -163,8 +166,15 @@ public class FIBEditorController extends FormBasicController {
 	}
 	
 	private void feedbackToTextElement(String responseIdentifier, String solution) {
-		JSCommand jsc = new JSCommand("try { tinymce.activeEditor.execCommand('qtiUpdateTextEntry', false, {\"responseIdentifier\":\"" + responseIdentifier + "\", \"data-qti-solution\": \"" + solution + "\"}); } catch(e){if(window.console) console.log(e) }");
-		getWindowControl().getWindowBackOffice().sendCommandTo(jsc);
+		try {
+			JSONObject jo = new JSONObject();
+			jo.put("responseIdentifier", responseIdentifier);
+			jo.put("data-qti-solution", solution);
+			Command jsc = new JSCommand("try { tinymce.activeEditor.execCommand('qtiUpdateTextEntry', false, " + jo.toString() + "); } catch(e){if(window.console) console.log(e) }");
+			getWindowControl().getWindowBackOffice().sendCommandTo(jsc);
+		} catch (JSONException e) {
+			logError("", e);
+		}
 	}
 	
 	private void cleanUp() {

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

@@ -14,7 +14,7 @@
 				author : 'frentix GmbH',
 				authorurl : 'http://www.frentix.com',
 				infourl : 'http://www.frentix.com',
-				version : '1.2.6'
+				version : '1.2.7'
 			};
 		},
 
@@ -407,9 +407,8 @@
 			}
 			
 			ed.addCommand('qtiUpdateTextEntry', function (ui, value) {
-				var val = eval(value);
-				var responseIdentifier = val['responseIdentifier'];
-				var solution = val['data-qti-solution'];
+				var responseIdentifier = value['responseIdentifier'];
+				var solution = value['data-qti-solution'];
 				jQuery("span[data-qti-response-identifier='" + responseIdentifier+ "']>span", ed.getBody()).each(function(index, el) {
 					jQuery(el).text(solution);
 				});