Merging compiler changes to master. WIP #1449 @0.25

diff --git a/inc/ws/Util/html5/html5video/class.ws.html5.links.php b/inc/ws/Util/html5/html5video/class.ws.html5.links.php
index 84b80fced5f7943cd4d7b4ce96e9bf712ba1286e..4f9c46ff5f2bf967c622dc0907033622b6c69fba 100644 (file)
--- a/inc/ws/Util/html5/html5video/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/html5video/class.ws.html5.links.php
@@ -364,7 +364,7 @@ class htmlMultimediaImage extends wsHTML5Link {
                $w = $this->width;
                $h = $this->height;
                $this->copyExternalFile($this->alternative);
-               $alt = '<img data-width="' . $w . '" data-height="' . $h . '" src="' . wsHTML5Link::getUniversalLocation($this->alternative) . '" width="' . $w . '" height="' . $h . '" />';
+               $alt = '<img class="multimediaimage" data-width="' . $w . '" data-height="' . $h . '" src="' . wsHTML5Link::getUniversalLocation($this->alternative) . '" width="' . $w . '" height="' . $h . '" />';
                return $alt;
        }
 

diff --git a/inc/ws/Util/html5/master/class.ws.html5.links.php b/inc/ws/Util/html5/master/class.ws.html5.links.php
index a11e45a5b5f8f1f3c4e0d5ec2b148218e6fb56c7..7b407ca5c1b650b5711c91a64b2a1e020a8a1da9 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.links.php
@@ -712,8 +712,7 @@ class webVideoLink extends videoLink {
                } elseif ($this->video_service == 1) {
                        $url = 'https://www.dailymotion.com/embed/video/' . $this->to;
                } elseif ($this->video_service == 2) {
-                       //Todo: get vimeo embed URL
-                       $url = '';
+                       $url = 'https://player.vimeo.com/video/' . $this->to;
                } elseif ($this->video_service == 3) {
                        list($playerId, $videoId) = explode('|', $this->to);
                        $url = 'https://link.brightcove.com/services/player/bcpid' . $playerId . '?bctid=' . $videoId . '&autoStart=false&width=100%25&height=100%25';
@@ -994,7 +993,17 @@ class webVideoPopupLink extends videoPopupLink {
        //      }
 
        public function getURL() {
-               return '#/video/' . $this->to;
+
+        switch($this->video_service) {
+            case 1: // Dailymotion
+                return '#/webvideo/dailymotion/' . $this->to;
+            break;
+            case 2: // Vimeo
+                return '#/webvideo/vimeo/' . $this->to;
+            break;
+            default:
+                return '#/video/' . $this->to;
+        }
        }
 
        public function getAdditionnalContent() {