(no commit message)

diff --git a/fluidbook/compile/_js/fluidbook.js b/fluidbook/compile/_js/fluidbook.js
index dadd95db7bc5ea3c34f98fa7037fe9d82cac3229..7dd30868a12e8da395785d16326622aa6fde87ee 100644 (file)
--- a/fluidbook/compile/_js/fluidbook.js
+++ b/fluidbook/compile/_js/fluidbook.js
@@ -27,7 +27,6 @@ function getPath() {
 }\r
 \r
 function getFlashvars(junk, fv) {\r
-\r
        var res = {};\r
        if (fv != undefined) {\r
                res = fv;\r
@@ -185,11 +184,12 @@ function redirectPDF() {
 function redirectMobile() {\r
        var page = '';\r
        var get = parseGet();\r
+       console.log(get);\r
        var html = 'index.html';\r
        if (get['widget'] != undefined && get['widget'] == '1') {\r
                html = 'widget.html';\r
-               page = '?';\r
-               if (get['backgroud'] != undefined) {\r
+               page = '?widget=1&';\r
+               if (get['background'] != undefined) {\r
                        page += "background=" + get['background'];\r
                }\r
        }\r
@@ -206,7 +206,7 @@ function redirectMobile() {
        }\r
 \r
 \r
-       if (pageNr > 0) {\r
+       if (page == '' && pageNr > 0) {\r
                page = '#/page/' + pageNr;\r
        }\r
 \r

diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php
index 8ef893b55dfd1a7fe262f65836f37bdaf68ad67c..7a2b9d70bba8d15d01f25034400c60ac53cc90de 100644 (file)
--- a/inc/ws/Util/class.ws.exporter.php
+++ b/inc/ws/Util/class.ws.exporter.php
@@ -53,6 +53,7 @@ class wsExporter {
                        CubeIT_Mobile_Phonegap::FEATURE_NOTIFICATION_DIALOG,
                        CubeIT_Mobile_Phonegap::FEATURE_INAPPBROWSER,
                        CubeIT_Mobile_Phonegap::FEATURE_SPLASHSCREEN,
+                       CubeIT_Mobile_Phonegap::FEATURE_GLOBALIZATION,
                        CubeIT_Mobile_Phonegap::FEATURE_PUSHNOTIFICATION
                                )
                );
@@ -363,7 +364,8 @@ class wsExporter {
                }
 
 
-               $cl = CubeIT_CommandLine_Rsync($src, $dest, $erase);
+
+               $cl = new CubeIT_CommandLine_Rsync($src, $dest, $erase);
                $cl->execute();
                if (!is_null($chown)) {
                        `chown -R $chown $dest`;

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 618db597c78130aa63de4d400293f6a9e9cfa855..af38b4777c63fcc9e41d324d497012b3c1f32eb3 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -236,7 +236,15 @@ class wsHTML5Compiler {
                $this->config = cubeObject::merge($this->book->parametres->toStandardObject(), $this->theme->parametres->toStandardObject());
        }
 
-       public static function getPhonegapVersion($v) {
+       public function getResolutions() {
+               $res = self::$resolutions;
+               if ($this->widget) {
+                       $res = array_merge(array(36), $res);
+               }
+               return $res;
+       }
+
+       public static function getPhonegapVersion($v = 'latest') {
                if ($v != 'latest') {
                        return $v;
                }
@@ -256,7 +264,6 @@ class wsHTML5Compiler {
                        $versions[] = $file;
                }
                usort($versions, 'version_compare');
-               $versions = array_reverse($versions, true);
                return $versions;
        }
 
@@ -471,43 +478,7 @@ class wsHTML5Compiler {
 
                $script = '';
                if ($this->phonegap) {
-                       $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();
-                       foreach ($standardPlugins as $p) {
-                               $to = $this->vdir . '/data/' . $p . '.js';
-                               $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);
-
-                               if ($this->phonegap == 'ios') {
-                                       $os = 'iOS';
-                               } else if ($this->phonegap == 'android') {
-                                       $os = 'Android';
-                               }
-
-                               $orig = PHONEGAP_PLUGINS . '/' . $os . '/' . $p;
-                               $dr = opendir($orig);
-                               while ($file = readdir($dr)) {
-                                       if ($file == '.' || $file == '..') {
-                                               continue;
-                                       }
-                                       if (files::getExtension($file) == 'js') {
-                                               $this->copy($orig . '/' . $file, $d . '/' . $file);
-                                               $script .= '<script type="text/javascript" src="' . $pluginDir . '/' . $file . '"></script>' . "\n";
-                                       }
-                               }
-                       }
+                       //$script .= '<script type="text/javascript" charset="utf-8" src="data/cordova.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";
@@ -907,7 +878,7 @@ class wsHTML5Compiler {
        }
 
        protected function writeImages() {
-               foreach (self::$resolutions as $r) {
+               foreach ($this->getResolutions() as $r) {
                        mkdir($this->vdir . '/data/background/' . $r, 0777, true);
                }
                $srcPrefix = $this->backgroundsPrefix;
@@ -927,7 +898,7 @@ class wsHTML5Compiler {
                                $this->copy($svg, $this->vdir . '/data/contents/p' . $page . '.svg');
                        }
 
-                       foreach (self::$resolutions as $r) {
+                       foreach ($this->getResolutions() as $r) {
                                $ok = $this->copy(WS_DOCS . '/' . $infos['document_id'] . '/html/' . $srcPrefix . $r . '-' . $infos['document_page'] . '.jpg', $this->vdir . '/data/background/' . $r . '/' . $this->backgroundsPrefix . $page . '.jpg');
                                if (!$ok && $r = 300) {
                                        $this->maxRes = 150;
@@ -1026,7 +997,7 @@ class wsHTML5Compiler {
                $res[] = '.doublePage._2d,.doublePage._3d{' . self::writeCSSUA('transition', 'all ' . $this->book->parametres->mobileTransitionDuration . 's ease-in-out') . '}';
 
                $res[] = '.background{' . self::writeCSSUA('transform-origin', 'top left') . ';}';
-               foreach (self::$resolutions as $r) {
+               foreach ($this->getResolutions() as $r) {
                        $ratio = round(72 / $r, 3) * $cssScale;
 
                        $wr = $cssWidth / $ratio;