Ref #13270 - remove inline events

add handlers to registerTeardown & move some events to database/search.js Signed-Off-By: Thomas Heinrichs <thheinrichs@outlook.de>
phpmyadmin · Feb 16, 2021 · dfe2fd5 · dfe2fd5
1 parent c1a66ad
commit dfe2fd5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/js/src/database/search.js b/js/src/database/search.js
@@ -26,6 +26,8 @@ AJAX.registerTeardown('database/search.js', function () {
     $('#togglesearchresultlink').off('click');
     $('#togglequerybox').off('click');
     $('#togglesearchformlink').off('click');
+    $('#select_all').off('click');
+    $('#unselect_all').off('click');
     $(document).off('submit', '#db_search_form.ajax');
 });
 
@@ -244,4 +246,13 @@ AJAX.registerOnload('database/search.js', function () {
             Functions.ajaxRemoveMessage($msgbox);
         });
     });
+
+    $('#select_all').on('click', function () {
+        Functions.setSelectOptions('db_search', 'criteriaTables[]', true);
+        return false;
+    });
+    $('#unselect_all').on('click', function () {
+        Functions.setSelectOptions('db_search', 'criteriaTables[]', false);
+        return false;
+    });
 }); // end $()
diff --git a/js/src/sql.js b/js/src/sql.js
@@ -12,6 +12,7 @@
 /* global codeMirrorEditor */ // js/functions.js
 /* global MicroHistory */ // js/microhistory.js
 /* global makeGrid */ // js/makegrid.js
+/* global sqlBoxLocked */ // js/functions.js
 
 var Sql = {};
 
@@ -213,6 +214,7 @@ AJAX.registerTeardown('sql.js', function () {
     $('body').off('keyup', '#sqlqueryform');
     $('body').off('click', 'form[name="resultsForm"].ajax button[name="submit_mult"], form[name="resultsForm"].ajax input[name="submit_mult"]');
     $(document).off('submit', '#maxRowsForm');
+    $(document).off('click', '#view_as');
 });
 
 /**
@@ -869,6 +871,10 @@ AJAX.registerOnload('sql.js', function () {
     $('#insertBtn').on('click', function () {
         Functions.insertValueQuery();
     });
+
+    $('#view_as').on('click', function () {
+        Functions.selectContent(this, sqlBoxLocked, true);
+    });
 }); // end $()
 
 /**

diff --git a/templates/database/search/main.twig b/templates/database/search/main.twig
@@ -39,10 +39,10 @@
         <fieldset class="pma-fieldset">
             <legend>{% trans 'Inside tables:' %}</legend>
             <p>
-                <a href="#" onclick="Functions.setSelectOptions('db_search', 'criteriaTables[]', true); return false;">
+                <a href="#" id="select_all">
                     {% trans 'Select all' %}
                 </a> /
-                <a href="#" onclick="Functions.setSelectOptions('db_search', 'criteriaTables[]', false); return false;">
+                <a href="#" id="unselect_all">
                     {% trans 'Unselect all' %}
                 </a>
             </p>

diff --git a/templates/view_create.twig b/templates/view_create.twig
@@ -85,7 +85,7 @@
             <tr>
                 <td class="text-nowrap">AS</td>
                 <td>
-                    <textarea name="view[as]" rows="15" cols="40" dir="{{ text_dir }}" onclick="Functions.selectContent(this, sqlBoxLocked, true)">{{ view['as'] }}</textarea><br>
+                    <textarea name="view[as]" id="view_as" rows="15" cols="40" dir="{{ text_dir }}">{{ view['as'] }}</textarea><br>
                     <input type="button" value="Format" id="format" class="btn btn-secondary button sqlbutton">
                     <span id="querymessage"></span>
                 </td>