#15792 Fixed deprecated :eq selector

Signed-off-by: Yash Bothra <yashrajbothra786@gmail.com>
phpmyadmin · Jan 20, 2020 · 98dc941 · 98dc941
1 parent dcf87ed
commit 98dc941
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/js/makegrid.js b/js/makegrid.js
@@ -288,15 +288,15 @@ var makeGrid = function (t, enableResize, enableReorder, enableVisib, enableGrid
         shiftCol: function (oldn, newn) {
             $(g.t).find('tr').each(function () {
                 if (newn < oldn) {
-                    $(this).find('th.draggable:eq(' + newn + '),' +
-                                 'td:eq(' + (g.actionSpan + newn) + ')')
-                        .before($(this).find('th.draggable:eq(' + oldn + '),' +
-                                                'td:eq(' + (g.actionSpan + oldn) + ')'));
+                    $(this).find('th.draggable').eq(newn)
+                        .add($(this).find('td').eq(g.actionSpan + newn))
+                        .before($(this).find('th.draggable').eq(oldn)
+                            .add($(this).find('td').eq(g.actionSpan + oldn)));
                 } else {
-                    $(this).find('th.draggable:eq(' + newn + '),' +
-                                 'td:eq(' + (g.actionSpan + newn) + ')')
-                        .after($(this).find('th.draggable:eq(' + oldn + '),' +
-                                               'td:eq(' + (g.actionSpan + oldn) + ')'));
+                    $(this).find('th.draggable').eq(newn)
+                        .add($(this).find('td').eq(g.actionSpan + newn))
+                        .after($(this).find('th.draggable').eq(oldn)
+                            .add($(this).find('td').eq(g.actionSpan + oldn)));
                 }
             });
             // reposition the column resize bars
@@ -475,8 +475,8 @@ var makeGrid = function (t, enableResize, enableReorder, enableVisib, enableGrid
                 // can hide if more than one column is visible
                 if (g.visibleHeadersCount > 1) {
                     $(g.t).find('tr').each(function () {
-                        $(this).find('th.draggable:eq(' + n + '),' +
-                                     'td:eq(' + (g.actionSpan + n) + ')')
+                        $(this).find('th.draggable').eq(n)
+                            .add($(this).find('td').eq(g.actionSpan + n))
                             .hide();
                     });
                     g.colVisib[n] = 0;
@@ -488,8 +488,8 @@ var makeGrid = function (t, enableResize, enableReorder, enableVisib, enableGrid
                 }
             } else {    // column n is not visible
                 $(g.t).find('tr').each(function () {
-                    $(this).find('th.draggable:eq(' + n + '),' +
-                                 'td:eq(' + (g.actionSpan + n) + ')')
+                    $(this).find('th.draggable').eq(n)
+                        .add($(this).find('td').eq(g.actionSpan + n))
                         .show();
                 });
                 g.colVisib[n] = 1;

diff --git a/js/navigation.js b/js/navigation.js
@@ -486,8 +486,8 @@ $(function () {
         dialog.executeDialog($(this).parent());
     });
     /** Export Triggers and Events */
-    $(document).on('click', 'li.trigger div:eq(1) a.ajax img,' +
-        ' li.event div:eq(1) a.ajax img', function (event) {
+    $(document).on('click', 'li.trigger div.second a.ajax img,' +
+        ' li.event div.second a.ajax img', function (event) {
         event.preventDefault();
         var dialog = new RTE.Object();
         dialog.exportDialog($(this).parent());

diff --git a/libraries/classes/Navigation/NavigationTree.php b/libraries/classes/Navigation/NavigationTree.php
@@ -1166,7 +1166,7 @@ private function renderNode($node, $recursive, $class = '')
                 }
             }
 
-            $retval .= "<div class='block " . $divClass . "'>";
+            $retval .= "<div class='block second" . $divClass . "'>";
 
             if (isset($node->links['icon']) && ! empty($node->links['icon'])) {
                 $args = [];