6 x

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2.6.0
+1. Compulsory questions
+2. Automatic scrolling if show all comments is active
+3. New Learning Progress mode
+4. Table of contents
+
 # 2.0.25
 1. Disable toolbar setting
 

VideoSources/class.ilInteractiveVideoSourceFactoryGUI.php

@@ -64,7 +64,7 @@ public function getPlayer($player_id)
 	protected function sourceDoesNotExistsAnymore()
 	{
 		ilUtil::sendFailure(ilInteractiveVideoPlugin::getInstance()->txt('source_does_not_exist'), true);
-		ilUtil::redirect('ilias.php?baseClass=ilPersonalDesktopGUI');
+		ilUtil::redirect('ilias.php?baseClass=ilDashboardGUI');
 	}
 
 	/**

VideoSources/class.ilInteractiveVideoUniqueIds.php

@@ -33,8 +33,7 @@ public static function getInstance()
 	 */
 	public function getNewId()
 	{
-		$new_id = $this->generateUniqueId();
-		return $new_id;
+        return $this->generateUniqueId();
 	}
 
 	/**
@@ -45,7 +44,7 @@ protected function generateUniqueId()
 	{
 		$unique_id = '';
 		for ($i = 0; $i <= self::ROUNDS; $i++) {
-			$rand = 'iv_' . rand();
+            $rand = uniqid('iv_');
 			if (!in_array($rand, $this->id_container)) {
 				$this->id_container[$rand] = $rand;
 				$unique_id                 = $rand;

VideoSources/core/MediaObject/class.ilInteractiveVideoMediaObjectGUI.php

@@ -55,7 +55,7 @@ public function getPlayer($player_id, $obj)
 	{
 		require_once 'Services/WebAccessChecker/classes/class.ilWACSignedPath.php';
 		$player = new ilTemplate(self::PATH . 'tpl/tpl.video.html', false, false);
-		ilObjMediaObjectGUI::includePresentationJS($player);
+		ilObjMediaObjectGUI::includePresentationJS();
 		$media_object = new ilInteractiveVideoMediaObject();
 		$mob_id     = $media_object->doReadVideoSource($obj->getId());
 		$mob_dir    = ilObjMediaObject::_getDirectory($mob_id);

VideoSources/core/MediaObject/js/jquery.InteractiveVideoMediaElementPlayer.js

@@ -13,35 +13,32 @@ $(document).ready(function () {
 				il.InteractiveVideo.last_stopPoint = -1;
 
 				il.InteractiveVideoSubtitle.initializeSubtitleTracks(player_id);
-
-				il.InteractiveVideo[player_id].player = new MediaElementPlayer("#" + player_id, {
+				il.InteractiveVideo[player_id].player = new MediaElementPlayer(player_id, {
 
 					timerRate:         50,
 					enablePluginDebug: false,
+					stretching: "responsive",
 
 					success: function (media) {
-
-						media.addEventListener('loadeddata', function () {
-							player = $("video#" + player_id)[0];
-
-							il.InteractiveVideoPlayerAbstract.config[player_id] = {
-								pauseCallback:          (function () {
-									player.pause(player_id);
-								}),
-								playCallback:           (function () {
-									player.play(player_id);
-								}),
-								durationCallback:       (function () {
-									return player.duration;
-								}),
-								currentTimeCallback:    (function () {
-									return player.currentTime;
-								}),
-								setCurrentTimeCallback: (function (time) {
-									player.setCurrentTime(time, player_id);
-								})
-							};
-
+						player = $("#" + player_id)[0];
+						il.InteractiveVideoPlayerAbstract.config[player_id] = {
+							pauseCallback:          (function () {
+								player.pause(player_id);
+							}),
+							playCallback:           (function () {
+								player.play(player_id);
+							}),
+							durationCallback:       (function () {
+								return player.duration;
+							}),
+							currentTimeCallback:    (function () {
+								return player.currentTime;
+							}),
+							setCurrentTimeCallback: (function (time) {
+								player.setCurrentTime(time, player_id);
+							})
+						};
+						media.addEventListener('loadedmetadata', function () {
 							il.InteractiveVideoPlayerComments.fillEndTimeSelector(il.InteractiveVideoPlayerAbstract.duration(player_id));
 						}, false);
 

VideoSources/core/MediaObject/lang/ilias_it.lang

@@ -0,0 +1 @@
+imo#:#Carica file video

VideoSources/core/SimpleUrl/class.ilInteractiveVideoSimpleUrl.php

@@ -168,7 +168,7 @@ public function getId()
 	 */
 	public function getClassPath()
 	{
-		return 'VideoSources/plugin/InteractiveVideoFauVideoPortal/class.ilInteractiveVideoSimpleUrl.php';
+		return 'VideoSources/core/SimpleUrl/class.ilInteractiveVideoSimpleUrl.php';
 	}
 
 	/**

VideoSources/core/SimpleUrl/js/jquery.InteractiveVideoSimpleUrlPlayer.js

@@ -13,34 +13,32 @@ $( document ).ready(function() {
 				il.InteractiveVideo.last_stopPoint = -1;
 				il.InteractiveVideoSubtitle.initializeSubtitleTracks(player_id);
 
-				il.InteractiveVideo[player_id].player = new MediaElementPlayer("#" + player_id, {
+				il.InteractiveVideo[player_id].player = new MediaElementPlayer(player_id, {
 
 					timerRate:         50,
 					enablePluginDebug: false,
+					stretching: "responsive",
 
 					success: function (media) {
-
-						media.addEventListener('loadeddata', function () {
-							player = $("video#" + player_id)[0];
-
-							il.InteractiveVideoPlayerAbstract.config[player_id] = {
-								pauseCallback:          (function () {
-									player.pause(player_id);
-								}),
-								playCallback:           (function () {
-									player.play(player_id);
-								}),
-								durationCallback:       (function () {
-									return player.duration;
-								}),
-								currentTimeCallback:    (function () {
-									return player.currentTime;
-								}),
-								setCurrentTimeCallback: (function (time) {
-									player.setCurrentTime(time, player_id);
-								})
-							};
-
+						player = $("#" + player_id)[0];
+						il.InteractiveVideoPlayerAbstract.config[player_id] = {
+							pauseCallback:          (function () {
+								player.pause(player_id);
+							}),
+							playCallback:           (function () {
+								player.play(player_id);
+							}),
+							durationCallback:       (function () {
+								return player.duration;
+							}),
+							currentTimeCallback:    (function () {
+								return player.currentTime;
+							}),
+							setCurrentTimeCallback: (function (time) {
+								player.setCurrentTime(time, player_id);
+							})
+						};
+						media.addEventListener('loadedmetadata', function () {
 							il.InteractiveVideoPlayerComments.fillEndTimeSelector(il.InteractiveVideoPlayerAbstract.duration(player_id));
 						}, false);
 

VideoSources/core/SimpleUrl/lang/ilias_it.lang

@@ -0,0 +1,3 @@
+surl#:#Url
+simple_url#:#URL semplice
+simple_url_info#:#Inserisci un URL a un video.

VideoSources/core/Youtube/js/jquery.InteractiveVideoYoutubePlayer.js

@@ -17,7 +17,7 @@ function onYouTubeIframeAPIReady() {
 	$.each(il.InteractiveVideo, function (player_id, value) {
 		if (value.hasOwnProperty("player_type") && value.player_type === "ytb") {
 			var player = new YT.Player(player_id, {
-				videoId:           interactiveVideoYoutubeId,
+				videoId:           $('#'+player_id).attr('data-youtube-id'),
 				events:            {
 					'onStateChange': onPlayerStateChange,
 					'onReady':       function (media) {

VideoSources/core/Youtube/lang/ilias_it.lang

@@ -0,0 +1,3 @@
+ytb_youtube_url#:#URL YouTube
+ytb_youtube_info#:#Inserisci un URL di YouTube.
+ytb#:#YouTube

VideoSources/core/Youtube/tpl/tpl.video.html

@@ -1,18 +1 @@
-<style>
-	#ilInteractiveVideo {
-		float: none;
-		clear: both;
-		width: 100%;
-		position: relative;
-	}
-	.ilInteractiveVideoPlayerContainer iframe {
-		top: 0;
-		left: 0;
-		width: 100%;
-		padding-top:15px;
-	}
-</style>
-<script>
-	var interactiveVideoYoutubeId = "{YOUTUBE_ID}";
-</script>
-<div id="{PLAYER_ID}"></div>
+<div id="{PLAYER_ID}" data-youtube-id="{YOUTUBE_ID}"></div>

classes/Form/class.ilTextAreaInputCkeditorGUI.php

@@ -18,9 +18,11 @@ public function __construct($a_title = "", $a_postvar = "")
 		$this->usePurifier(true);
 	}
 
-	/**
-	 * Insert property html
-	 */
+    /**
+     * @param ilTemplate $a_tpl
+     * @return int|void
+     * @throws ilTemplateException
+     */
 	public function insert($a_tpl)
 	{
 		$this->appendJavascriptFile();