wip #7598 @1

diff --git a/app/Fluidbook/Compiler/Links.php b/app/Fluidbook/Compiler/Links.php
index 7498286f58b62075eb5a4612319f78c38e9f28ba..f482a9e5f59837a2d68c860f636665d117964cd9 100644 (file)
--- a/app/Fluidbook/Compiler/Links.php
+++ b/app/Fluidbook/Compiler/Links.php
@@ -366,11 +366,6 @@ trait Links
                         $v = 'pages';
                     }
 
-                    $lta->setInitialOrder($i);
-//                    if (!isset($$v[$lta->page][$lta->blendmode])) {
-//                        $$v[$lta->page][$lta->blendmode] = [];
-//                    }
-
                     // array_push($$v[$lta->page][$lta->blendmode], $lta);
                     array_push($$v[$lta->page]['normal'], $lta);
                     $i++;
@@ -492,7 +487,7 @@ trait Links
         }
         $res = [];
         foreach ($list as $blendmode => $l) {
-            usort($l, [$this, '_sortLinksByDepth']);
+            usort($l, [$this, '_sortLinksByTabOrder']);
             $res[$blendmode] = [];
             foreach ($l as $item) {
                 $res[$blendmode][] = $item->getHTMLContainer();
@@ -503,17 +498,9 @@ trait Links
 
     }
 
-    protected function _sortLinksByDepth($a, $b)
+    protected function _sortLinksByTabOrder($a, $b)
     {
-        $c = $a->getDepth() - $b->getDepth();
-        if ($c === 0) {
-            $c = $b->getSurface() - $a->getSurface();
-        }
-        if ($c === 0) {
-            $c = $b->getInitialOrder() - $a->getInitialOrder();
-        }
-
-        return $c;
+        return (int)$a->getOrder() - (int)$b->getOrder() ;
     }
 
     public function addTriggersLink($page, $link, $delay = 0)