Forráskód Böngészése

Fixing ie8 issues when loading LP audio.

Julio Montoya 11 éve
szülő
commit
db0338993e

+ 5 - 1
main/inc/lib/display.lib.php

@@ -1563,11 +1563,15 @@ class Display {
                     $autoplay = 'autoplay';
                 }
                 $width = isset($params['width']) ? 'width="'.$params['width'].'"' : null;
-                $html = '<audio id="'.$fileInfo['basename'].'" controls '.$autoplay.' '.$width.' src="'.$file.'" >';
+                $id = isset($params['id']) ? $params['id'] : $fileInfo['basename'];
+                $class = isset($params['class']) ? ' class="'.$params['class'].'"' : null;
+
+                $html = '<audio id="'.$id.'" '.$class.' controls '.$autoplay.' '.$width.' src="'.$file.'" >';
                 $html .=  '<object width="'.$params['width'].'" height="50" type="application/x-shockwave-flash" data="'.api_get_path(WEB_LIBRARY_PATH).'javascript/mediaelement/flashmediaelement.swf">
                                 <param name="movie" value="'.api_get_path(WEB_LIBRARY_PATH).'javascript/mediaelement/flashmediaelement.swf" />
                                 <param name="flashvars" value="controls=true&file='.$fileInfo['basename'].'" />
                             </object>';
+                 $html .= '</audio>';
                 return $html;
                 break;
 

+ 1 - 1
main/newscorm/learnpath.class.php

@@ -2042,7 +2042,7 @@ class learnpath {
                 $file = '../../courses/'.$_course['path'].'/document'.$lpPathInfo['dir'].$audio;
             }
 
-            $player = Display::getMediaPlayer($file, array('autoplay' => $autostart_audio, 'width' => '100%'));
+            $player = Display::getMediaPlayer($file, array('id' => 'lp_audio_media_player', 'autoplay' => $autostart_audio, 'width' => '100%'));
 
             // The mp3 player.
             $output  = '<div id="container">';

+ 108 - 81
main/newscorm/lp_ajax_switch_item.php

@@ -27,10 +27,16 @@ require_once 'back_compat.inc.php';
  * @param   integer Current item ID
  * @param   integer New item ID
  */
-function switch_item_details($lp_id, $user_id, $view_id, $current_item, $next_item) {
-    $debug = 0;
+function switch_item_details($lp_id, $user_id, $view_id, $current_item, $next_item)
+{
+    $debug  = 0;
     $return = '';
-    if ($debug > 0) { error_log('In xajax_switch_item_details('.$lp_id.','.$user_id.','.$view_id.','.$current_item.','.$next_item.')', 0); }
+    if ($debug > 0) {
+        error_log(
+            'In xajax_switch_item_details('.$lp_id.','.$user_id.','.$view_id.','.$current_item.','.$next_item.')',
+            0
+        );
+    }
     //$objResponse = new xajaxResponse();
     /*$item_id may be one of:
      * -'next'
@@ -47,16 +53,24 @@ function switch_item_details($lp_id, $user_id, $view_id, $current_item, $next_it
     require_once 'aiccItem.class.php';
     $mylp = '';
     if (isset($_SESSION['lpobject'])) {
-        if ($debug > 1) { error_log('$_SESSION[lpobject] is set', 0); }
+        if ($debug > 1) {
+            error_log('$_SESSION[lpobject] is set', 0);
+        }
         $oLP = unserialize($_SESSION['lpobject']);
         if (!is_object($oLP)) {
-            if ($debug > 1) { error_log(print_r($oLP,true), 0); }
-            if ($debug > 2) { error_log('Building new lp', 0); }
+            if ($debug > 1) {
+                error_log(print_r($oLP, true), 0);
+            }
+            if ($debug > 2) {
+                error_log('Building new lp', 0);
+            }
             unset($oLP);
             $code = api_get_course_id();
-            $mylp = new learnpath($code,$lp_id,$user_id);
+            $mylp = new learnpath($code, $lp_id, $user_id);
         } else {
-            if ($debug > 1) { error_log('Reusing session lp', 0); }
+            if ($debug > 1) {
+                error_log('Reusing session lp', 0);
+            }
             $mylp = $oLP;
         }
     }
@@ -66,31 +80,39 @@ function switch_item_details($lp_id, $user_id, $view_id, $current_item, $next_it
             $mylp->set_current_item($current_item);
             $mylp->next();
             $new_item_id = $mylp->get_current_item_id();
-            if ($debug > 1) { error_log('In {next} - next item is '.$new_item_id.'(current: '.$current_item.')', 0); }
+            if ($debug > 1) {
+                error_log('In {next} - next item is '.$new_item_id.'(current: '.$current_item.')', 0);
+            }
             break;
         case 'previous':
             $mylp->set_current_item($current_item);
             $mylp->previous();
             $new_item_id = $mylp->get_current_item_id();
-            if ($debug > 1) { error_log('In {previous} - next item is '.$new_item_id.'(current: '.$current_item.')', 0); }
+            if ($debug > 1) {
+                error_log('In {previous} - next item is '.$new_item_id.'(current: '.$current_item.')', 0);
+            }
             break;
         case 'first':
             $mylp->set_current_item($current_item);
             $mylp->first();
             $new_item_id = $mylp->get_current_item_id();
-            if ($debug > 1) { error_log('In {first} - next item is '.$new_item_id.'(current: '.$current_item.')', 0); }
+            if ($debug > 1) {
+                error_log('In {first} - next item is '.$new_item_id.'(current: '.$current_item.')', 0);
+            }
             break;
         case 'last':
             break;
         default:
             // Should be filtered to check it's not hacked.
-            if($next_item == $current_item){
+            if ($next_item == $current_item) {
                 // If we're opening the same item again.
                 $mylp->items[$current_item]->restart();
             }
             $new_item_id = $next_item;
             $mylp->set_current_item($new_item_id);
-            if ($debug > 1) { error_log('In {default} - next item is '.$new_item_id.'(current: '.$current_item.')', 0); }
+            if ($debug > 1) {
+                error_log('In {default} - next item is '.$new_item_id.'(current: '.$current_item.')', 0);
+            }
             break;
     }
     $mylp->start_current_item(true);
@@ -101,7 +123,9 @@ function switch_item_details($lp_id, $user_id, $view_id, $current_item, $next_it
     if (is_object($mylp->items[$new_item_id])) {
         $mylpi = $mylp->items[$new_item_id];
     } else {
-        if ($debug > 1) { error_log('In switch_item_details - generating new item object', 0); }
+        if ($debug > 1) {
+            error_log('In switch_item_details - generating new item object', 0);
+        }
         $mylpi = new learnpathItem($new_item_id, $user_id);
         $mylpi->set_lp_view($view_id);
     }
@@ -115,15 +139,17 @@ function switch_item_details($lp_id, $user_id, $view_id, $current_item, $next_it
      * -suspend_data
      */
     $myscore = $mylpi->get_score();
-    $mymax = $mylpi->get_max();
-    if ($mymax === '') { $mymax = "''"; }
-    $mymin = $mylpi->get_min();
-    $mylesson_status = $mylpi->get_status();
-    $mylesson_location = $mylpi->get_lesson_location();
-    $mytotal_time = $mylpi->get_scorm_time('js');
-    $mymastery_score = $mylpi->get_mastery_score();
+    $mymax   = $mylpi->get_max();
+    if ($mymax === '') {
+        $mymax = "''";
+    }
+    $mymin              = $mylpi->get_min();
+    $mylesson_status    = $mylpi->get_status();
+    $mylesson_location  = $mylpi->get_lesson_location();
+    $mytotal_time       = $mylpi->get_scorm_time('js');
+    $mymastery_score    = $mylpi->get_mastery_score();
     $mymax_time_allowed = $mylpi->get_max_time_allowed();
-    $mylaunch_data = $mylpi->get_launch_data();
+    $mylaunch_data      = $mylpi->get_launch_data();
     /*
     if ($mylpi->get_type() == 'asset') {
         // Temporary measure to save completion of an asset. Later on, Chamilo should trigger something on unload, maybe... (even though that would mean the last item cannot be completed)
@@ -132,11 +158,11 @@ function switch_item_details($lp_id, $user_id, $view_id, $current_item, $next_it
         $mylpi->save();
     }
     */
-    $mysession_time = $mylpi->get_total_time();
-    $mysuspend_data = $mylpi->get_suspend_data();
+    $mysession_time    = $mylpi->get_total_time();
+    $mysuspend_data    = $mylpi->get_suspend_data();
     $mylesson_location = $mylpi->get_lesson_location();
-    $myic = $mylpi->get_interactions_count();
-    $myistring = '';
+    $myic              = $mylpi->get_interactions_count();
+    $myistring         = '';
     for ($i = 0; $i < $myic; $i++) {
         $myistring .= ",[".$i.",'','','','','','','']";
     }
@@ -153,21 +179,21 @@ function switch_item_details($lp_id, $user_id, $view_id, $current_item, $next_it
      * with both SCORM and proper learning path tracking.
      */
     $return .=
-            "olms.score=".$myscore.";" .
-            "olms.max=".$mymax.";" .
-            "olms.min=".$mymin.";" .
-            "olms.lesson_status='".$mylesson_status."';" .
-            "olms.lesson_location='".$mylesson_location."';" .
-            "olms.session_time='".$mysession_time."';" .
-            "olms.suspend_data='".$mysuspend_data."';" .
-            "olms.total_time = '".$mytotal_time."';" .
-            "olms.mastery_score = '".$mymastery_score."';" .
-            "olms.max_time_allowed = '".$mymax_time_allowed."';" .
-            "olms.launch_data = '".$mylaunch_data."';" .
-            "olms.interactions = new Array(".$myistring.");" .
-            "olms.item_objectives = new Array();" .
-            "olms.G_lastError = 0;" .
-            "olms.G_LastErrorMessage = 'No error';" ;
+        "olms.score=".$myscore.";".
+        "olms.max=".$mymax.";".
+        "olms.min=".$mymin.";".
+        "olms.lesson_status='".$mylesson_status."';".
+        "olms.lesson_location='".$mylesson_location."';".
+        "olms.session_time='".$mysession_time."';".
+        "olms.suspend_data='".$mysuspend_data."';".
+        "olms.total_time = '".$mytotal_time."';".
+        "olms.mastery_score = '".$mymastery_score."';".
+        "olms.max_time_allowed = '".$mymax_time_allowed."';".
+        "olms.launch_data = '".$mylaunch_data."';".
+        "olms.interactions = new Array(".$myistring.");".
+        "olms.item_objectives = new Array();".
+        "olms.G_lastError = 0;".
+        "olms.G_LastErrorMessage = 'No error';";
     /*
      * and re-initialise the rest
      * -lms_lp_id
@@ -179,56 +205,57 @@ function switch_item_details($lp_id, $user_id, $view_id, $current_item, $next_it
      * -lms_view_id
      * -lms_user_id
      */
-    $mytotal = $mylp->get_total_items_count_without_chapters();
-    $mycomplete = $mylp->get_complete_items_count();
-    $myprogress_mode = $mylp->get_progress_bar_mode();
-    $myprogress_mode = ($myprogress_mode == '' ? '%' : $myprogress_mode);
-    $mynext = $mylp->get_next_item_id();
-    $myprevious = $mylp->get_previous_item_id();
-    $myitemtype = $mylpi->get_type();
-    $mylesson_mode = $mylpi->get_lesson_mode();
-    $mycredit = $mylpi->get_credit();
-    $mylaunch_data = $mylpi->get_launch_data();
+    $mytotal              = $mylp->get_total_items_count_without_chapters();
+    $mycomplete           = $mylp->get_complete_items_count();
+    $myprogress_mode      = $mylp->get_progress_bar_mode();
+    $myprogress_mode      = ($myprogress_mode == '' ? '%' : $myprogress_mode);
+    $mynext               = $mylp->get_next_item_id();
+    $myprevious           = $mylp->get_previous_item_id();
+    $myitemtype           = $mylpi->get_type();
+    $mylesson_mode        = $mylpi->get_lesson_mode();
+    $mycredit             = $mylpi->get_credit();
+    $mylaunch_data        = $mylpi->get_launch_data();
     $myinteractions_count = $mylpi->get_interactions_count();
-    $myobjectives_count = $mylpi->get_objectives_count();
-    $mycore_exit = $mylpi->get_core_exit();
+    $myobjectives_count   = $mylpi->get_objectives_count();
+    $mycore_exit          = $mylpi->get_core_exit();
 
     $return .=
-            //"saved_lesson_status='not attempted';" .
-            "olms.lms_lp_id=".$lp_id.";" .
-            "olms.lms_item_id=".$new_item_id.";" .
-            "olms.lms_old_item_id=0;" .
-            //"lms_been_synchronized=0;" .
-            "olms.lms_initialized=0;" .
-            //"lms_total_lessons=".$mytotal.";" .
-            //"lms_complete_lessons=".$mycomplete.";" .
-            //"lms_progress_bar_mode='".$myprogress_mode."';" .
-            "olms.lms_view_id=".$view_id.";" .
-            "olms.lms_user_id=".$user_id.";" .
-            "olms.next_item=".$new_item_id.";" . // This one is very important to replace possible literal strings.
-            "olms.lms_next_item=".$mynext.";" .
-            "olms.lms_previous_item=".$myprevious.";" .
-            "olms.lms_item_type = '".$myitemtype."';" .
-            "olms.lms_item_credit = '".$mycredit."';" .
-            "olms.lms_item_lesson_mode = '".$mylesson_mode."';" .
-            "olms.lms_item_launch_data = '".$mylaunch_data."';" .
-            "olms.lms_item_interactions_count = '".$myinteractions_count."';" .
-            "olms.lms_item_objectives_count = '".$myinteractions_count."';" .
-            "olms.lms_item_core_exit = '".$mycore_exit."';" .
-            "olms.asset_timer = 0;";
+        //"saved_lesson_status='not attempted';" .
+        "olms.lms_lp_id=".$lp_id.";".
+        "olms.lms_item_id=".$new_item_id.";".
+        "olms.lms_old_item_id=0;".
+        //"lms_been_synchronized=0;" .
+        "olms.lms_initialized=0;".
+        //"lms_total_lessons=".$mytotal.";" .
+        //"lms_complete_lessons=".$mycomplete.";" .
+        //"lms_progress_bar_mode='".$myprogress_mode."';" .
+        "olms.lms_view_id=".$view_id.";".
+        "olms.lms_user_id=".$user_id.";".
+        "olms.next_item=".$new_item_id.";". // This one is very important to replace possible literal strings.
+        "olms.lms_next_item=".$mynext.";".
+        "olms.lms_previous_item=".$myprevious.";".
+        "olms.lms_item_type = '".$myitemtype."';".
+        "olms.lms_item_credit = '".$mycredit."';".
+        "olms.lms_item_lesson_mode = '".$mylesson_mode."';".
+        "olms.lms_item_launch_data = '".$mylaunch_data."';".
+        "olms.lms_item_interactions_count = '".$myinteractions_count."';".
+        "olms.lms_item_objectives_count = '".$myinteractions_count."';".
+        "olms.lms_item_core_exit = '".$mycore_exit."';".
+        "olms.asset_timer = 0;";
 
     $return .= "update_toc('unhighlight','".$current_item."');".
-                "update_toc('highlight','".$new_item_id."');".
-                "update_toc('$mylesson_status','".$new_item_id."');".
-                "update_progress_bar('$mycomplete','$mytotal','$myprogress_mode');";
+        "update_toc('highlight','".$new_item_id."');".
+        "update_toc('$mylesson_status','".$new_item_id."');".
+        "update_progress_bar('$mycomplete','$mytotal','$myprogress_mode');";
 
     $mylp->set_error_msg('');
     $mylp->prerequisites_match(); // Check the prerequisites are all complete.
-    if ($debug > 1) { error_log('Prereq_match() returned '.htmlentities($mylp->error), 0); }
+    if ($debug > 1) {
+        error_log('Prereq_match() returned '.htmlentities($mylp->error), 0);
+    }
     $_SESSION['scorm_item_id'] = $new_item_id; // Save the new item ID for the exercise tool to use.
-    $_SESSION['lpobject'] = serialize($mylp);
+    $_SESSION['lpobject']      = serialize($mylp);
     return $return;
-    //return $objResponse;
 }
 
 echo switch_item_details($_REQUEST['lid'], $_REQUEST['uid'], $_REQUEST['vid'], $_REQUEST['iid'], $_REQUEST['next']);

+ 6 - 2
main/newscorm/lp_nav.php

@@ -65,9 +65,13 @@ if (isset($_SESSION['lpobject'])) {
 }
 session_write_close();
 ?>
-<script>
+<script type="text/javascript">
 $(document).ready(function() {
-$('video:not(.skip), audio:not(.skip)').mediaelementplayer();
+    jQuery('video:not(.skip), audio:not(.skip)').mediaelementplayer({
+        success: function(player, node) {
+        }
+    });
+
 });
 </script>
 <span>

+ 12 - 0
main/newscorm/scorm_api.php

@@ -1463,17 +1463,29 @@ function switch_item(current_item, next_item){
         xajax_start_timer();
     }
 
+
     //(4) refresh the audio player if needed
     $.ajax({
         type: "POST",
         url: "lp_nav.php",
         data: "",
+        beforeSend: function() {
+            $.each($('audio'), function () {
+                var player = new MediaElementPlayer($(this));
+                player.pause();
+            });
+        },
         success: function(tmp_data) {
             if ($("#lp_media_file").length != 0) {
                 $("#lp_media_file").html(tmp_data);
             }
         }
     });
+
+
+
+
+
     return true;
 }
 

+ 1 - 1
main/template/default/layout/footer.tpl

@@ -69,7 +69,7 @@ $(document).ready( function() {
     });
 
     // Mediaelement
-    $('video:not(.skip), audio:not(.skip)').mediaelementplayer(/* Options */);
+    jQuery('video:not(.skip), audio:not(.skip)').mediaelementplayer(/* Options */);
 
     // Table highlight.
     $("form .data_table input:checkbox").click(function() {