Merge OpenOLAT 10.3 to OpenOLAT default with 3e28fa86416f480eecec3fc63cf078238d3e624c

src/main/java/org/olat/course/nodes/scorm/ScormRunController.java

@@ -296,13 +296,13 @@ public class ScormRunController extends BasicController implements ScormAPICallb
 						attemptsIncremented, deliveryOptions);
 			} else if (chooseScormRunMode.getSelectedElement().equals(ScormConstants.SCORM_MODE_NORMAL)) {
 				// When not assessible users can choose between normal mode where data is stored...
-				scormDispC = ScormMainManager.getInstance().createScormAPIandDisplayController(ureq, getWindowControl(), showMenu, null,
+				scormDispC = ScormMainManager.getInstance().createScormAPIandDisplayController(ureq, getWindowControl(), showMenu, this,
 						cpRoot, null, courseId + "-" + scormNode.getIdent(), ScormConstants.SCORM_MODE_NORMAL,
 						ScormConstants.SCORM_MODE_CREDIT, false, assessableType, doActivate, fullWindow,
 						attemptsIncremented, deliveryOptions);
 			} else {
 				// ... and preview mode where no data is stored
-				scormDispC = ScormMainManager.getInstance().createScormAPIandDisplayController(ureq, getWindowControl(), showMenu, null,
+				scormDispC = ScormMainManager.getInstance().createScormAPIandDisplayController(ureq, getWindowControl(), showMenu, this,
 						cpRoot, null, courseId, ScormConstants.SCORM_MODE_BROWSE, ScormConstants.SCORM_MODE_NOCREDIT,
 						false, assessableType, doActivate, fullWindow, attemptsIncremented, deliveryOptions);
 			}
@@ -336,7 +336,6 @@ public class ScormRunController extends BasicController implements ScormAPICallb
 		//
 	}
 
-	// <BPS-620>
 	/**
 	 * @see org.olat.modules.scorm.ScormAPICallback#lmsFinish(java.lang.String,
 	 *      java.util.Properties)
@@ -348,8 +347,6 @@ public class ScormRunController extends BasicController implements ScormAPICallb
 		}
 	}
 
-	// </BPS-620>
-
 	/**
 	 * @return true if there is a treemodel and an event listener ready to be
 	 *         used in outside this controller

src/main/java/org/olat/modules/scorm/ScormAPICallback.java

@@ -47,12 +47,10 @@ public interface ScormAPICallback {
 	 */
 	void lmsCommit(String olatSahsId, Properties scoScores, Properties scoLessonStatus);
 	
-	// <OLATCE-289>
 	/**
 	 * @param olatSahsId
 	 * @param scoScores properties with key: scoId, value = rawscore 
 	 */
 	void lmsFinish(String olatSahsId, Properties scoProps, Properties scoLessonStatus);
-	// </OLATCE-289>
 
 }

src/main/webapp/static/js/openolat/scormApiAdapter.js

@@ -198,7 +198,7 @@ function olatonunload(){
 			iframeDoc.location.replace("about:blank");
 			iframeDoc = null;
 			//delay(200);
-			//if((new Date().getTime() - lastRequest) > 60000) alert("Current SCO will be finised befor initializing next SCO or terminating! Press OK to proceed.");
+			//if((new Date().getTime() - lastRequest) > 60000) alert("Current SCO will be finished before initializing next SCO or terminating! Press OK to proceed.");
 			
 			var delayReq = new XMLHttpRequest();
 			//"false" waits until the result arrived;

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

@@ -277,9 +277,9 @@
 									align: 'center',
 									spacing: 5,
 									items: [
-										{name: 'width', type: 'textbox', maxLength: 3, size: 3, onchange: generatePreview},
+										{name: 'width', type: 'textbox', maxLength: 4, size: 4, onchange: generatePreview},
 										{type: 'label', text: 'x'},
-										{name: 'height', type: 'textbox', maxLength: 3, size: 3, onchange: generatePreview}
+										{name: 'height', type: 'textbox', maxLength: 4, size: 4, onchange: generatePreview}
 									]
 								},
 					    	    { name: 'preview', type: 'panel', label: '', minHeight: 320,