wait #3987 @1

diff --git a/inc/ws/Util/class.ws.links.php b/inc/ws/Util/class.ws.links.php
index cf5a9300fa6ba5f91bd056b938d226bb7ed37df0..7e27735dcf46042a18c5daecf97ec9c89eb666d9 100644 (file)
--- a/inc/ws/Util/class.ws.links.php
+++ b/inc/ws/Util/class.ws.links.php
@@ -33,6 +33,7 @@ class wsLinks
             'alternative' => __('Alternative'),
             'read_mode' => __('Mode de lecture'),
             'image' => __('Image'), 'image_rollover' => __('Animation au survol'),
+            'animation' => __('Animation'),
             'group' => __('Groupe'),
         );
 
@@ -350,7 +351,7 @@ class wsLinks
 
     public static function saveLinksInFile($book_id, $user_id, $comments, $links, $rulers = [], $specialLinks = [], $specialRulers = [])
     {
-        $lr = wsLinks::mergeLinksAndRulers($links, $rulers, $specialLinks, $specialRulers);
+        $lr = self::mergeLinksAndRulers($links, $rulers, $specialLinks, $specialRulers);
         $meta = ['links' => count($lr['links']), 'rulers' => count($lr['rulers']), 'comments' => $comments, 'user' => $user_id];
         $base = self::getLinksDir($book_id) . '/' . TIME;
         $latestLinks = self::getLinksDir($book_id) . '/latest.links.gz';

diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
index 578f76eb7325e4ac66ef9574ca6280ab6f63ab98..48a814e96f6ed2fb5fff18b3a4b5092692df21ff 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -1511,6 +1511,7 @@ class wsHTML5Compiler
             if (isset($linkData['image']) && $linkData['image'] && $linkData['type'] != 28 && $linkData['type'] != 35) {
                 $dupData = $linkData;
                 $dupData['image'] = '';
+                $dupData['animation'] = '';
                 $dupData['to'] = $linkData['image'];
                 $dupData['rollover'] = $linkData['image_rollover'];
                 $dupData['type'] = 15;
@@ -1520,6 +1521,20 @@ class wsHTML5Compiler
                 }
                 array_push($links, $dupData);
             }
+            if (isset($linkData['animation']) && $linkData['animation']) {
+                $dupData = $linkData;
+                $dupData['image'] = '';
+                $dupData['animation'] = '';
+                $dupData['inline'] = true;
+                $dupData['interactive'] = false;
+                $dupData['alternative'] = $linkData['animation'];
+                $dupData['type'] = 6;
+                $dupData['uid'] = 'a_' . $linkData['uid'];
+                if (wsHTML5Link::isScorm($linkData)) {
+                    $dupData['scorm'] = true;
+                }
+                array_push($links, $dupData);
+            }
             if ($linkData['type'] == 7) {
                 $k = $linkData['to'];
                 $e = explode(':', $k);
@@ -1554,7 +1569,6 @@ class wsHTML5Compiler
                 continue;
             }
 
-
             $linkData['hidden'] = in_array($linkData['uid'], $hiddenLinks);
             if ($linkData['type'] == 28) {
                 $this->addSEOArticle('#/page/' . $linkData['page'], $linkData['to'], $linkData['extra'], $linkData['image']);