(no commit message)

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 15e02fd1616203219fb916a17b7076a73c1e8bb0..3443b09fa7dc70a475f485ae18ef1e7397ad5a5c 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -453,20 +453,21 @@ class wsHTML5Compiler {
 
                $script = '';
                if ($this->phonegap) {
-                       $script .= '<script type="text/javascript" src="data/cordova.js"></script>' . "\n";
+                       $script .= '<script type="text/javascript" charset="utf-8" src="data/cordova.js"></script>' . "\n";
 
                        $standardPlugins = isset($this->phonegapStandardPlugins[$this->phonegap]) ? $this->phonegapStandardPlugins[$this->phonegap] : array();
-
-                       fb($standardPlugins);
                        foreach ($standardPlugins as $p) {
                                $to = $this->vdir . '/data/' . $p . '.js';
-                               copy($this->assets . '/js/libs/phonegap/plugins/' . $this->phonegap . '/' . $p . '.js', $to);
-                               $script .= '<script type="text/javascript" src="data/' . $p . '.js"></script>' . "\n";
+                               $this->copy($this->assets . '/js/libs/phonegap/plugins/' . $this->phonegap . '/' . $p . '.js', $to);
+                               $script .= '<script type="text/javascript" charset="utf-8" src="data/' . $p . '.js"></script>' . "\n";
                        }
 
                        $plugins = explode("\n", $this->book->parametres->phonegapPlugins);
                        foreach ($plugins as $p) {
                                $p = trim($p);
+                               if($p=='ChildBrowser'){
+                                       continue;
+                               }
                                $pluginDir = 'data/phonegap/' . $p;
                                $d = $this->vdir . '/' . $pluginDir;
                                mkdir($d, 0777, true);
@@ -484,16 +485,17 @@ class wsHTML5Compiler {
                                                continue;
                                        }
                                        if (files::getExtension($file) == 'js') {
-                                               copy($orig . '/' . $file, $d . '/' . $file);
+                                               $this->copy($orig . '/' . $file, $d . '/' . $file);
                                                $script .= '<script type="text/javascript" src="' . $pluginDir . '/' . $file . '"></script>' . "\n";
                                        }
                                }
                        }
                }
-               $script .= '<script type="text/javascript" src="data/fluidbook.js"></script>' . "\n";
-               $script .= '<script type="text/javascript" src="data/search.js"></script>' . "\n";
+               $script .= '<script type="text/javascript" charset="utf-8" src="data/datas.js"></script>' . "\n";
+               $script .= '<script type="text/javascript" charset="utf-8" src="data/fluidbook.js"></script>' . "\n";
+               $script .= '<script type="text/javascript" charset="utf-8" src="data/search.js"></script>' . "\n";
                foreach ($this->pluginJs as $p) {
-                       $script .= '<script type="text/javascript" src="' . $p . '"></script>' . "\n";
+                       $script .= '<script type="text/javascript" charset="utf-8" src="' . $p . '"></script>' . "\n";
                }
 
                $description = '';
@@ -510,23 +512,23 @@ class wsHTML5Compiler {
 
                $scripts = array();
                foreach ($this->debugJsFiles as $js) {
-                       $scripts[] = '<script type="text/javascript" src="' . $js . '"></script>';
+                       $scripts[] = '<script type="text/javascript" charset="utf-8" src="' . $js . '"></script>';
                }
                foreach ($this->jsFiles as $js) {
-                       $scripts[] = '<script type="text/javascript" src="' . $js . '"></script>';
+                       $scripts[] = '<script type="text/javascript" charset="utf-8" src="' . $js . '"></script>';
                }
                foreach ($this->pluginJs as $js) {
-                       $scripts[] = '<script type="text/javascript" src="' . $js . '"></script>';
+                       $scripts[] = '<script type="text/javascript" charset="utf-8" src="' . $js . '"></script>';
                }
 
-               $scripts[] = '<script type="text/javascript" src="data/datas.js"></script>';
+               $scripts[] = '<script type="text/javascript" charset="utf-8" src="data/datas.js"></script>';
                $script = implode("\n\t\t", $scripts);
 
                $scripts = array();
                foreach ($this->testJsFiles as $js) {
-                       $scripts[] = '<script type="text/javascript" src="' . $js . '"></script>';
+                       $scripts[] = '<script type="text/javascript" charset="utf-8" src="' . $js . '"></script>';
                }
-               $scripts[] = '<script type="text/javascript" src="data/datas.js"></script>';
+               $scripts[] = '<script type="text/javascript" charset="utf-8" src="data/datas.js"></script>';
                $script_test = implode("\n\t\t", $scripts);
 
                $thtml = $uhtml;
@@ -536,7 +538,7 @@ class wsHTML5Compiler {
                        $uhtml = str_replace('<!-- $' . $v . ' -->', $$v, $uhtml);
                }
 
-               $script.="\n\t\t" . '<script type="text/javascript">window.tester = true;</script>';
+               $script.="\n\t\t" . '<script type="text/javascript" charset="utf-8">window.tester = true;</script>';
                $vars = array('titre', 'credits', 'ga', 'style', 'script', 'print');
                foreach ($vars as $v) {
                        $thtml = str_replace('<!-- $' . $v . ' -->', $$v, $thtml);
@@ -548,7 +550,7 @@ class wsHTML5Compiler {
 
                // Write widget html
                $whtml = file_get_contents($this->assets . '/widget.html');
-               $script = '<script type="text/javascript" src="data/widget.js"></script>';
+               $script = '<script type="text/javascript" charset="utf-8" src="data/widget.js"></script>';
 
                $style = '<link type="text/css" rel="stylesheet" href="style/widget.css">';
                $vars = array('titre', 'style', 'script');
@@ -564,7 +566,7 @@ class wsHTML5Compiler {
                        return;
                }
 
-               copy(WS_BOOKS . '/final/' . $this->book->book_id . '/data/' . $this->book->parametres->pdfName, $this->vdir . '/data/' . $this->book->parametres->pdfName);
+               $this->copy(WS_BOOKS . '/final/' . $this->book->book_id . '/data/' . $this->book->parametres->pdfName, $this->vdir . '/data/' . $this->book->parametres->pdfName);
                return '';
        }
 
@@ -728,7 +730,7 @@ class wsHTML5Compiler {
                                $uglify->execute();
                        }
 
-                       $js = $config . file_get_contents($minimized);
+                       $js = file_get_contents($minimized);
                        file_put_contents($this->vdir . '/data/' . $jsfinal . '.js', $js);
                }
 

diff --git a/inc/ws/Util/packager/class.ws.packager.phonegap.php b/inc/ws/Util/packager/class.ws.packager.phonegap.php
index e7e5c1b607e40dc420780eaa0a9dd0756383dde2..5e4919960b1c11eb2264e0eaef30d6b5dc06d91b 100644 (file)
--- a/inc/ws/Util/packager/class.ws.packager.phonegap.php
+++ b/inc/ws/Util/packager/class.ws.packager.phonegap.php
@@ -175,9 +175,18 @@ class wsPackagerPhonegap extends wsPackager {
                $back = imagecolorhexallocate($im, $this->theme->parametres->backgroundColor);
                imagefill($im, 0, 0, $back);
                // Draw image
-
-
                $this->_drawBackImage($im, $width, $height);
+               // Draw logo loader
+               if ($this->theme->parametres->logoLoader) {
+                       $im2 = imagecreatefromfile($this->themeRoot . '/' . $this->theme->parametres->logoLoader);
+                       $lw = imagesx($im2);
+                       $lh = imagesy($im2);
+                       imagealphablending($im,true);
+                       imagealphablending($im2,true);
+                       imagecopy($im, $im2, ($width - $lw) / 2, ($height - $lh) / 2, 0, 0, $lw, $lh);
+                       imagedestroy($im2);
+               }
+
                imagepng($im, $dir . '/' . $name . '.png');
        }
 

diff --git a/ios/Cube_Wildcard_Profile.mobileprovision b/ios/Cube_Wildcard_Profile.mobileprovision
new file mode 100644 (file)
index 0000000..c62c79b
Binary files /dev/null and b/ios/Cube_Wildcard_Profile.mobileprovision differ