(no commit message)

diff --git a/inc/ws/Util/_common.php b/inc/ws/Util/_common.php
index d3d58df233ad1ca1fbe010ceab9151e264c34be1..5753a4fe28e7b1e67dbf629e9840da9c9b21c8a6 100644 (file)
--- 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';\r
 $__autoload['wsTools'] = dirname(__FILE__) . '/class.ws.tools.php';\r
 $__autoload['wsHTML5Compiler'] = dirname(__FILE__) . '/html5/class.ws.html5.compiler.php';\r
+$__autoload['wsHTML5Link'] = dirname(__FILE__) . '/html5/class.ws.html5.links.php';\r
 ?>
\ 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 b5bafba36eea956265bd659ad49b064d60064db8..44ef1616771fffefeb5ebef1c13475cb44078189 100644 (file)
--- 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 e47b0f47fbd1f319f28c52617519425ecf23d95e..b0bf8cb3be5eb9eb740a8ce9f8677d69e82680ca 100644 (file)
--- 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 e9c59a1ae9126e18b321ad94dc8424ce649e9a14..1014e7e83a21658d6fe24075d4ab2fa04326dd92 100644 (file)
--- a/inc/ws/Util/packager/_common.php
+++ b/inc/ws/Util/packager/_common.php
@@ -2,8 +2,6 @@
 \r
 $__autoload['wsPackager'] = dirname(__FILE__) . '/class.ws.packager.php';\r
 $__autoload['wsPackagerHTML'] = dirname(__FILE__) . '/class.ws.packager.html.php';\r
-$__autoload['wsPackagerHTML5'] = dirname(__FILE__) . '/html5/class.ws.packager.html5.php';\r
-$__autoload['wsPackagerHTML5Link'] = dirname(__FILE__) . '/html5/class.ws.packager.html5.links.php';\r
 $__autoload['wsPackagerWinEXE'] = dirname(__FILE__) . '/class.ws.packager.win.exe.php';\r
 $__autoload['wsPackagerWinCD'] = dirname(__FILE__) . '/class.ws.packager.win.cd.php';\r
 $__autoload['wsPackagerMacEXE'] = dirname(__FILE__) . '/class.ws.packager.mac.exe.php';\r