From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Mon, 15 Aug 2011 18:17:30 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=838223f555f795a30f0ffe19eb0c32ab5f0e09cc;p=cubeextranet.git

---

diff --git a/inc/ws/Util/_common.php b/inc/ws/Util/_common.php
index d3d58df23..5753a4fe2 100644
--- a/inc/ws/Util/_common.php
+++ b/inc/ws/Util/_common.php
@@ -10,4 +10,5 @@ $__autoload['wsSWF2HTMLMatrix'] = dirname(__FILE__) . '/class.ws.swf2html.php';
 $__autoload['wsSecureSWF'] = dirname(__FILE__) . '/class.ws.secure.swf.php';
 $__autoload['wsTools'] = dirname(__FILE__) . '/class.ws.tools.php';
 $__autoload['wsHTML5Compiler'] = dirname(__FILE__) . '/html5/class.ws.html5.compiler.php';
+$__autoload['wsHTML5Link'] = dirname(__FILE__) . '/html5/class.ws.html5.links.php';
 ?>
\ No newline at end of file
diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index b5bafba36..44ef16167 100644
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -177,7 +177,7 @@ class wsHTML5Compiler {
 		$pages = array();
 		$css = array();
 		foreach ($links as $linkData) {
-			$link = wsPackagerHTML5Link::getInstance($this->base62($i), $linkData, $this);
+			$link = wsHTML5Link::getInstance($this->base62($i), $linkData, $this);
 			if (is_null($link)) {
 				continue;
 			}
diff --git a/inc/ws/Util/html5/class.ws.html5.links.php b/inc/ws/Util/html5/class.ws.html5.links.php
index e47b0f47f..b0bf8cb3b 100644
--- a/inc/ws/Util/html5/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/class.ws.html5.links.php
@@ -1,6 +1,6 @@
 <?php
 
-class wsPackagerHTML5Link {
+class wsHTML5Link {
 
 	public $left;
 	public $top;
@@ -118,7 +118,7 @@ class wsPackagerHTML5Link {
 
 }
 
-class normalLink extends wsPackagerHTML5Link {
+class normalLink extends wsHTML5Link {
 
 	public function getHTMLContent() {
 		$class = array();
@@ -142,7 +142,7 @@ class normalLink extends wsPackagerHTML5Link {
 
 }
 
-class contentLink extends wsPackagerHTML5Link {
+class contentLink extends wsHTML5Link {
 	
 }
 
@@ -190,7 +190,7 @@ class internalLink extends normalLink {
 
 }
 
-class videoLink extends wsPackagerHTML5Link {
+class videoLink extends wsHTML5Link {
 
 	public function getHTMLContent() {
 		$file = $this->to;
@@ -267,7 +267,7 @@ class actionLink extends internalLink {
 
 }
 
-class basketLink extends wsPackagerHTML5Link {
+class basketLink extends wsHTML5Link {
 	
 }
 
@@ -301,7 +301,7 @@ class fileLink extends normalLink {
 
 }
 
-class multimediaLink extends wsPackagerHTML5Link {
+class multimediaLink extends wsHTML5Link {
 
 	public function getHTMLContent() {
 		return cubeMedia::flashObject(wsPackagerHTML5Link::getUniversalLocation($this->to), $this->width, $this->height, array(), '', '', 9, '#ffffff', '', 'true', 'noscale', 'transparent');
diff --git a/inc/ws/Util/packager/_common.php b/inc/ws/Util/packager/_common.php
index e9c59a1ae..1014e7e83 100644
--- a/inc/ws/Util/packager/_common.php
+++ b/inc/ws/Util/packager/_common.php
@@ -2,8 +2,6 @@
 
 $__autoload['wsPackager'] = dirname(__FILE__) . '/class.ws.packager.php';
 $__autoload['wsPackagerHTML'] = dirname(__FILE__) . '/class.ws.packager.html.php';
-$__autoload['wsPackagerHTML5'] = dirname(__FILE__) . '/html5/class.ws.packager.html5.php';
-$__autoload['wsPackagerHTML5Link'] = dirname(__FILE__) . '/html5/class.ws.packager.html5.links.php';
 $__autoload['wsPackagerWinEXE'] = dirname(__FILE__) . '/class.ws.packager.win.exe.php';
 $__autoload['wsPackagerWinCD'] = dirname(__FILE__) . '/class.ws.packager.win.cd.php';
 $__autoload['wsPackagerMacEXE'] = dirname(__FILE__) . '/class.ws.packager.mac.exe.php';