wait #7602 @1

diff --git a/.idea/deployment.xml b/.idea/deployment.xml
index 1fdb47f1959ebfcbcced6104fe10d489feafe1f6..7b80a145939508494183172e788fb27998d57ac4 100644 (file)
--- a/.idea/deployment.xml
+++ b/.idea/deployment.xml
@@ -17,14 +17,25 @@
           </mappings>
         </serverdata>
       </paths>
-      <paths name="alphaville.cubedesigners.com">
+      <paths name="amadeus.cubedesigners.com">
         <serverdata>
           <mappings>
-            <mapping deploy="/app/vendor/fluidbook/tools" local="$PROJECT_DIR$" web="/" />
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
+      <paths name="benhur.cubedesigners.com">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
+      <paths name="bloomsburrie.dev2.cubedesigners.com">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
           </mappings>
-          <excludedPaths>
-            <excludedPath local="true" path="$PROJECT_DIR$/vendor" />
-          </excludedPaths>
         </serverdata>
       </paths>
       <paths name="demo1.cubedesigners.com">
@@ -97,6 +108,20 @@
           </mappings>
         </serverdata>
       </paths>
+      <paths name="dev.prescription-quotidien.com">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
+      <paths name="dev.prescription-quotidien.com (Host)">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="dev.rbcmobilier.com">
         <serverdata>
           <mappings>
@@ -135,6 +160,13 @@
           </mappings>
         </serverdata>
       </paths>
+      <paths name="elearning.fluidbook.com">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="etatpur.ei-plateforme1.com">
         <serverdata>
           <mappings>
@@ -232,6 +264,20 @@
           </mappings>
         </serverdata>
       </paths>
+      <paths name="rmbars">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
+      <paths name="rmleds">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="simeox.dev.cubedesigners.com">
         <serverdata>
           <mappings>
@@ -246,6 +292,13 @@
           </mappings>
         </serverdata>
       </paths>
+      <paths name="staging.bloomsburie.com">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="stats3.fluidbook.com">
         <serverdata>
           <mappings>
@@ -270,6 +323,27 @@
           </mappings>
         </serverdata>
       </paths>
+      <paths name="v4.fluidbook.com">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
+      <paths name="v7.cubedesigners.com">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
+      <paths name="v7.cubedesigners.com (host)">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="vps-e87c4d02.vps.ovh.net">
         <serverdata>
           <mappings>
@@ -291,28 +365,35 @@
           </mappings>
         </serverdata>
       </paths>
-      <paths name="www.ccgm.fr">
+      <paths name="www.bastide-resah.fr">
         <serverdata>
           <mappings>
             <mapping local="$PROJECT_DIR$" web="/" />
           </mappings>
         </serverdata>
       </paths>
-      <paths name="www.cesaretleonie.fr">
+      <paths name="www.bloomsburie.com">
         <serverdata>
           <mappings>
             <mapping local="$PROJECT_DIR$" web="/" />
           </mappings>
         </serverdata>
       </paths>
-      <paths name="www.cfgv.fr">
+      <paths name="www.ccgm.fr">
+        <serverdata>
+          <mappings>
+            <mapping local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
+      <paths name="www.cesaretleonie.fr">
         <serverdata>
           <mappings>
             <mapping local="$PROJECT_DIR$" web="/" />
           </mappings>
         </serverdata>
       </paths>
-      <paths name="www.cubedesigners.fr">
+      <paths name="www.cfgv.fr">
         <serverdata>
           <mappings>
             <mapping local="$PROJECT_DIR$" web="/" />

diff --git a/src/Links/Link.php b/src/Links/Link.php
index 861950b3a79d7a7d9ab25d4949c0862855acea59..05045ed8e203482a35886fd6ba6218eb49a252ca 100644 (file)
--- a/src/Links/Link.php
+++ b/src/Links/Link.php
@@ -126,6 +126,7 @@ class Link
     public $borderColor = '#ffffff';
     public $maxWidth = 0;
     public $initialOrder = 0;
+    public $order = 0;
     public $gamifyCoins = 0;
     public $tooltipColor = null;
     public $tooltipBackgroundColor = null;
@@ -142,6 +143,10 @@ class Link
 
     /** @var float */
     public $delay = 0;
+    /**
+     * @var float
+     */
+    public $duration = 0;
 
     protected $_init;
 
@@ -712,8 +717,12 @@ class Link
             $res .= 'data-tooltip-color="' . $this->tooltipColor . '" ';
         }
         $delay = $this->getDelay();
-        if ($delay) {
-            $res .= 'data-delay="' . $delay . '" ';
+        $duration = $this->getDuration();
+        if ($delay > 0 || $duration > 0) {
+            if (!$duration) {
+                $duration = 0.4;
+            }
+            $res .= 'data-delay="' . $delay . '" data-reveal-duration="' . $duration . '"';
         }
         if ($this->polygon) {
             $res .= 'data-polygon="' . e($this->polygon) . '" ';
@@ -737,6 +746,15 @@ class Link
         return max(0, (float)$this->delay);
     }
 
+    /**
+     * @return float
+     */
+    public function getDuration(): float
+    {
+        return max(0, (float)$this->duration);
+    }
+
+
     public function getClasses()
     {
 
@@ -965,6 +983,16 @@ class Link
         return $res;
     }
 
+    public function getOrder()
+    {
+        return $this->order;
+    }
+
+    public function setOrder($order)
+    {
+        $this->order = $order;
+    }
+
     public static function _getLinkKey()
     {
         if (self::$_linksKey === null) {