wip #1253 @4

diff --git a/inc/ws/Util/class.ws.exporter.php b/inc/ws/Util/class.ws.exporter.php
index 42952c86a737ef694aaf6862bc31f5740db1c6b1..da67ff7ca150cccba454b30eaeee4cbecb360c34 100644 (file)
--- a/inc/ws/Util/class.ws.exporter.php
+++ b/inc/ws/Util/class.ws.exporter.php
@@ -215,7 +215,6 @@ class wsExporter {
 
 
                // Transfert
-               `sudo /usr/local/bin/remountmac`;
                $this->_rsync(WS_COLLECTIONS . '/resources/' . $collection->collection_id . '/' . $os, "/mnt/macbox" . $this->_iosProjectDir($collection->settings['namespace']) . '/' . CubeIT_Text::str2URL($collection->nom) . '/Resources', false);
        }
 

diff --git a/inc/ws/Util/html5/class.ws.html5.compiler.php b/inc/ws/Util/html5/class.ws.html5.compiler.php
index 97b240b2fe64485e4f4f06386fb76c738bd8f6d9..035abd857ca36b596e05c5bf75778375952fdd8b 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/class.ws.html5.compiler.php
@@ -125,7 +125,7 @@ class wsHTML5Compiler {
        public $book;
        protected $pages;
        protected $theme;
-       protected $version;
+       public $version;
        public $book_id;
        protected $themeRoot;
 
@@ -163,12 +163,14 @@ class wsHTML5Compiler {
        protected $multiApp = false;
        protected $pageLabels = array();
 
+
        function __construct($book_id, $version = 'stable', $phonegap = false, $phonegapVersion = 'latest', $dir = null, $standalone = false, $appcache = false, $home = false) {
                global $core;
 
                $this->phonegapVersion = self::getPhonegapVersion($phonegapVersion);
                $this->appcache = $appcache;
                $this->multiApp = $this->home = $home;
+               $this->version = $version;
 
                if ($version == 'stable') {
                        $this->assets = WS_COMPILE_ASSETS . '/_html5prod';

diff --git a/inc/ws/Util/html5/class.ws.html5.links.php b/inc/ws/Util/html5/class.ws.html5.links.php
index f1310aac3ee25dd8a9299fd901a8c2fefcd91a08..5870546c1205135bf32002dc50b1ed5c7be2f375 100644 (file)
--- a/inc/ws/Util/html5/class.ws.html5.links.php
+++ b/inc/ws/Util/html5/class.ws.html5.links.php
@@ -92,8 +92,11 @@ class wsHTML5Link {
                        case 12:
 
                                return new basketLink($id, $init, $compiler);
-                       case 13:
-                               return null;
+                       case 13: // zoom area
+                               if ($compiler->version == 'stable') {
+                                       return null;
+                               }
+                               return new zoomLink($id, $init, $compiler);
                        case 14:
                                return new colorLink($id, $init, $compiler);
                        case 15:
@@ -1071,4 +1074,23 @@ class haguenauManifLink extends internalLink {
 
 }
 
-?>
+class zoomLink extends normalLink {
+
+       public function getDefaultTooltip() {
+               return 'zoom in';
+       }
+
+       public function __construct($id, $init, $compiler) {
+               parent::__construct($id, $init, $compiler);
+
+               fb($id, 'ID');
+               fb($init, 'INIT');
+               fb($compiler, 'COMPILER');
+       }
+
+       public function getClasses() {
+               return array_merge(['zoomPopup'], parent::getClasses());
+       }
+
+
+}
\ No newline at end of file