Move pos3_name and pos3_value to pos3_nav using data-* attributes

Ref: d944f08 Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · May 30, 2020 · aec59d5 · aec59d5
1 parent d944f08
commit aec59d5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/js/navigation.js b/js/navigation.js
@@ -258,8 +258,10 @@ Navigation.traverseForPaths = function () {
             params['n' + count + '_pos2_name'] = pos2Nav.attr('data-name');
             params['n' + count + '_pos2_value'] = pos2Nav.attr('data-value');
 
-            params['n' + count + '_pos3_name'] = $(this).find('span.pos3_name').text();
-            params['n' + count + '_pos3_value'] = $(this).find('span.pos3_value').text();
+            var pos3Nav = $(this).find('span.pos3_nav');
+
+            params['n' + count + '_pos3_name'] = pos3Nav.attr('data-name');
+            params['n' + count + '_pos3_value'] = pos3Nav.attr('data-value');
             count++;
         }
     });

diff --git a/libraries/classes/Navigation/NavigationTree.php b/libraries/classes/Navigation/NavigationTree.php
@@ -1032,12 +1032,10 @@ private function getPaginationParamsHtml($node)
             $retval .= '"></span>';
         }
         if (isset($paths['aPath_clean'][4])) {
-            $retval .= '<span class="hide pos3_name">';
-            $retval .= $paths['aPath_clean'][4];
-            $retval .= '</span>';
-            $retval .= "<span class='hide pos3_value'>";
-            $retval .= htmlspecialchars((string) $node->pos3);
-            $retval .= '</span>';
+            $retval .= '<span class="hide pos3_nav"';
+            $retval .= ' data-name="' . $paths['aPath_clean'][4] . '"';
+            $retval .= ' data-value="' . htmlspecialchars((string) $node->pos3) . '"';
+            $retval .= '"></span>';
         }
 
         return $retval;