From c4d1716022b807171633512e9c06496180506cf6 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Tue, 23 Apr 2013 08:12:29 +0000 Subject: [PATCH] --- inc/ws/Util/html5/class.ws.html5.compiler.php | 40 +++++++++--------- .../packager/class.ws.packager.phonegap.php | 13 +++++- ios/Cube_Wildcard_Profile.mobileprovision | Bin 0 -> 7278 bytes 3 files changed, 32 insertions(+), 21 deletions(-) create mode 100644 ios/Cube_Wildcard_Profile.mobileprovision diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php index 15e02fd16..3443b09fa 100644 --- 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 .= '' . "\n"; + $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 .= '' . "\n"; + $this->copy($this->assets . '/js/libs/phonegap/plugins/' . $this->phonegap . '/' . $p . '.js', $to); + $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 .= '' . "\n"; } } } } - $script .= '' . "\n"; - $script .= '' . "\n"; + $script .= '' . "\n"; + $script .= '' . "\n"; + $script .= '' . "\n"; foreach ($this->pluginJs as $p) { - $script .= '' . "\n"; + $script .= '' . "\n"; } $description = ''; @@ -510,23 +512,23 @@ class wsHTML5Compiler { $scripts = array(); foreach ($this->debugJsFiles as $js) { - $scripts[] = ''; + $scripts[] = ''; } foreach ($this->jsFiles as $js) { - $scripts[] = ''; + $scripts[] = ''; } foreach ($this->pluginJs as $js) { - $scripts[] = ''; + $scripts[] = ''; } - $scripts[] = ''; + $scripts[] = ''; $script = implode("\n\t\t", $scripts); $scripts = array(); foreach ($this->testJsFiles as $js) { - $scripts[] = ''; + $scripts[] = ''; } - $scripts[] = ''; + $scripts[] = ''; $script_test = implode("\n\t\t", $scripts); $thtml = $uhtml; @@ -536,7 +538,7 @@ class wsHTML5Compiler { $uhtml = str_replace('', $$v, $uhtml); } - $script.="\n\t\t" . ''; + $script.="\n\t\t" . ''; $vars = array('titre', 'credits', 'ga', 'style', 'script', 'print'); foreach ($vars as $v) { $thtml = str_replace('', $$v, $thtml); @@ -548,7 +550,7 @@ class wsHTML5Compiler { // Write widget html $whtml = file_get_contents($this->assets . '/widget.html'); - $script = ''; + $script = ''; $style = ''; $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 e7e5c1b60..5e4919960 100644 --- 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 index 0000000000000000000000000000000000000000..c62c79b1a852b17cd8ed4e3cd1135469901e8586 GIT binary patch literal 7278 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 js=J