From b2e1e8f6978155e55098133da00bef843a0b332f Mon Sep 17 00:00:00 2001
From: "stephen@cubedesigners.com"
 <stephen@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 9 Jun 2017 09:44:15 +0000
Subject: [PATCH] Merging compiler changes to master. WIP #1449 @0.25

---
 .../html5/html5video/class.ws.html5.links.php     |  2 +-
 inc/ws/Util/html5/master/class.ws.html5.links.php | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

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 84b80fced..4f9c46ff5 100644
--- 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 a11e45a5b..7b407ca5c 100644
--- 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() {
-- 
2.39.5