Merge master changes to burgermenu branch.

diff --git a/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php b/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php
index 8b99eaecf394ada1266614ca26f03acff3771e39..ace9c99ca21765f202f0f3e33ef6ef7cc919b48b 100644 (file)
--- a/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/burgermenu/class.ws.html5.compiler.php
@@ -296,20 +296,12 @@ class wsHTML5Compiler {
 
                $this->log('Start compile process');
 
-               // Copy fonts folder
-               $from = $this->assets . '/style/fonts';
-               $to = 'style/fonts';
-               $this->vdir->copyDirectory($from, $to);
-
-               // Copy images folder
-               $from = $this->assets . '/images';
-               $to = 'images';
-               $this->vdir->copyDirectory($from, $to);
-
-               // Copy images folder
-               $from = $this->assets . '/video';
-               $to = 'video';
-               $this->vdir->copyDirectory($from, $to);
+               // Raw copy of some directories
+               $directories = array('style/fonts', 'images', 'sound', 'video');
+               foreach ($directories as $directory) {
+                       $from = $this->assets . '/' . $directory;
+                       $this->vdir->copyDirectory($from, $directory);
+               }
 
                $this->log('Copied assets');
                $this->loadPlugins();

diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
index 96e12e7890aa4ad940939c603e050ff7e402761a..ace9c99ca21765f202f0f3e33ef6ef7cc919b48b 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -1562,4 +1562,4 @@ class wsHTML5Compiler {
 
        }
 
-}
\ No newline at end of file
+}

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 86f1633a657db997896b02103b8f3254c568b7d0..76305d856971a5b8d9b8dbce2e9411d6621b3ad0 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.links.php
@@ -1307,4 +1307,4 @@ class zoomLink extends normalLink {
        public function getClasses() {
                return array_merge(['zoomPopup'], parent::getClasses());
        }
-}
\ No newline at end of file
+}