From 62ea8af14416ef317f554e3b0fddc3ba6afec1dc Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 18 Jun 2012 09:40:06 +0000
Subject: [PATCH]

---
 .../tools/fwstk/nbproject/private/private.xml |  3 +++
 inc/ws/Util/html5/class.ws.html5.links.php    | 19 +++++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/fluidbook/tools/fwstk/nbproject/private/private.xml b/fluidbook/tools/fwstk/nbproject/private/private.xml
index cc2c0e57c..1ee292a27 100644
--- a/fluidbook/tools/fwstk/nbproject/private/private.xml
+++ b/fluidbook/tools/fwstk/nbproject/private/private.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
+    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">
+        <file>file:/H:/Works/cubeExtranet/fluidbook/tools/fwstk/src/com/fluidbook/fwstk/Main.java</file>
+    </open-files>
 </project-private>
diff --git a/inc/ws/Util/html5/class.ws.html5.links.php b/inc/ws/Util/html5/class.ws.html5.links.php
index 89164d9c2..db22c0fd2 100644
--- a/inc/ws/Util/html5/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/class.ws.html5.links.php
@@ -88,8 +88,8 @@ class wsHTML5Link {
 	public function getAdditionnalContent() {
 		
 	}
-	
-	public function getClasses(){
+
+	public function getClasses() {
 		return array();
 	}
 
@@ -129,7 +129,7 @@ class wsHTML5Link {
 class normalLink extends wsHTML5Link {
 
 	public function getHTMLContent() {
-		$class =$this->getClasses();
+		$class = $this->getClasses();
 		if ($this->display_area) {
 			$class[] = 'displayArea';
 		}
@@ -246,9 +246,9 @@ class videoPopupLink extends normalLink {
 
 		return '#/video/' . $basename;
 	}
-	
+
 	public function getAdditionnalContent() {
-		return ' data-video="'.rawurlencode(videoLink::makeVideoTag($this)).'" ';
+		return ' data-video="' . rawurlencode(videoLink::makeVideoTag($this)) . '" ';
 	}
 
 }
@@ -319,7 +319,14 @@ class fileLink extends normalLink {
 class multimediaLink extends wsHTML5Link {
 
 	public function getHTMLContent() {
-		return cubeMedia::flashObject(wsHTML5Link::getUniversalLocation($this->to), $this->width * $this->compiler->getCssScale(), $this->height * $this->compiler->getCssScale(), array(), '', '', 9, '#ffffff', '', 'true', 'noscale', 'transparent');
+		$this->copyExternalFile($this->to);
+		$w = $this->width * $this->compiler->getCssScale();
+		$h = $this->height * $this->compiler->getCssScale();
+		if ($this->alternative != '') {
+			$this->copyExternalFile($this->alternative);
+		}
+		$alt = $this->alternative == '' ? '' : '<img src="' . wsHTML5Link::getUniversalLocation($this->alternative) . '" width="' . $w . '" height="' . $h . '" />';
+		return cubeMedia::flashObject(wsHTML5Link::getUniversalLocation($this->to), $w, $h, array(), '', '', 9, '#ffffff', $alt, 'true', 'default', 'transparent');
 	}
 
 }
-- 
2.39.5