Move vPath, aPath, pos to paths_nav using data-* attributes

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

Hide file tree

Showing 2 changed files with 19 additions and 20 deletions.
diff --git a/js/navigation.js b/js/navigation.js
@@ -134,10 +134,11 @@ Navigation.loadChildNodes = function (isNode, $expandElem, callback) {
         }
         $destination = $expandElem.closest('li');
         var pos2Name = $expandElem.find('span.pos2_nav');
+        var pathsNav = $expandElem.find('span.paths_nav');
         params = {
-            'aPath': $expandElem.find('span.aPath').text(),
-            'vPath': $expandElem.find('span.vPath').text(),
-            'pos': $expandElem.find('span.pos').text(),
+            'aPath': pathsNav.attr('data-apath'),
+            'vPath': pathsNav.attr('data-vpath'),
+            'pos': pathsNav.attr('data-pos'),
             'pos2_name': pos2Name.attr('data-name'),
             'pos2_value': pos2Name.attr('data-value'),
             'searchClause': '',
@@ -150,9 +151,9 @@ Navigation.loadChildNodes = function (isNode, $expandElem, callback) {
     } else {
         $destination = $('#pma_navigation_tree_content');
         params = {
-            'aPath': $expandElem.attr('aPath'),
-            'vPath': $expandElem.attr('vPath'),
-            'pos': $expandElem.attr('pos'),
+            'aPath': $expandElem.attr('data-apath'),
+            'vPath': $expandElem.attr('data-vpath'),
+            'pos': $expandElem.attr('data-pos'),
             'pos2_name': '',
             'pos2_value': '',
             'searchClause': '',
@@ -243,8 +244,9 @@ Navigation.traverseForPaths = function () {
         if ($(this).find('img').is('.ic_b_minus') &&
             $(this).closest('li').find('div.list_container .ic_b_minus').length === 0
         ) {
-            params['n' + count + '_aPath'] = $(this).find('span.aPath').text();
-            params['n' + count + '_vPath'] = $(this).find('span.vPath').text();
+            var pathsNav = $(this).find('span.paths_nav');
+            params['n' + count + '_aPath'] = pathsNav.attr('data-apath');
+            params['n' + count + '_vPath'] = pathsNav.attr('data-vpath');
 
             var pos2Nav = $(this).find('span.pos2_nav');
 

diff --git a/libraries/classes/Navigation/NavigationTree.php b/libraries/classes/Navigation/NavigationTree.php
@@ -1128,15 +1128,12 @@ private function renderNode($node, $recursive, $class = '')
 
                 $retval .= '<a class="' . $node->getCssClasses($match) . '"';
                 $retval .= " href='#'>";
-                $retval .= "<span class='hide aPath'>";
-                $retval .= $paths['aPath'];
-                $retval .= '</span>';
-                $retval .= "<span class='hide vPath'>";
-                $retval .= $paths['vPath'];
-                $retval .= '</span>';
-                $retval .= "<span class='hide pos'>";
-                $retval .= $this->pos;
-                $retval .= '</span>';
+
+                $retval .= '<span class="hide paths_nav"';
+                $retval .= ' data-apath="' . $paths['aPath'] . '"';
+                $retval .= ' data-vpath="' . $paths['vPath'] . '"';
+                $retval .= ' data-pos="' . $this->pos . '"';
+                $retval .= '"></span>';
                 $retval .= $this->getPaginationParamsHtml($node);
                 if ($GLOBALS['cfg']['ShowDatabasesNavigationAsTree']
                     || $parentName != 'root'
@@ -1333,9 +1330,9 @@ public function renderDbSelect()
             $options .= '<option value="'
                 . htmlspecialchars($node->realName) . '"'
                 . ' title="' . htmlspecialchars($title) . '"'
-                . ' apath="' . $paths['aPath'] . '"'
-                . ' vpath="' . $paths['vPath'] . '"'
-                . ' pos="' . $this->pos . '"';
+                . ' data-apath="' . $paths['aPath'] . '"'
+                . ' data-vpath="' . $paths['vPath'] . '"'
+                . ' data-pos="' . $this->pos . '"';
             if ($node->realName == $selected) {
                 $options .= ' selected';
             }