Import the Functions object where possible

Instead of using from the Window global object.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>

.eslintrc.json

@@ -13,9 +13,6 @@
         "browser": true,
         "es6": true
     },
-    "globals": {
-        "Functions": "readonly"
-    },
     "rules": {
         "valid-jsdoc": ["error", {
             "prefer": {

js/src/ajax.js

@@ -436,8 +436,8 @@ const AJAX = {
                     $('#modalOverlay').remove();
                 }
                 $('fieldset.disabled_for_expiration').removeAttr('disabled').removeClass('disabled_for_expiration');
-                AJAX.fireTeardown('functions.js');
-                AJAX.fireOnload('functions.js');
+                AJAX.fireTeardown('main.js');
+                AJAX.fireOnload('main.js');
             }
             if (typeof data.new_token !== 'undefined') {
                 $('input[name=token]').val(data.new_token);

js/src/config.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from './functions.js';
 import { CommonParams } from './common.js';
 
 /**

js/src/database/central_columns.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from '../functions.js';
 import { CommonParams } from '../common.js';
 
 /**

js/src/database/events.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from '../functions.js';
 
 /* global Navigation */
 

js/src/database/multi_table_query.js

@@ -1,15 +1,13 @@
 import $ from 'jquery';
+import { Functions } from '../functions.js';
 import { CommonParams } from '../common.js';
 
 /**
  * @fileoverview    function used in QBE for DB
  * @name            Database Operations
  *
- * @requires    jQuery
  * @requires    jQueryUI
- * @requires    js/functions.js
  * @requires    js/database/query_generator.js
- *
  */
 
 /**

js/src/database/operations.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from '../functions.js';
 import { CommonActions, CommonParams } from '../common.js';
 
 /* global Navigation */
@@ -7,10 +8,7 @@ import { CommonActions, CommonParams } from '../common.js';
  * @fileoverview    function used in server privilege pages
  * @name            Database Operations
  *
- * @requires    jQuery
  * @requires    jQueryUI
- * @requires    js/functions.js
- *
  */
 
 /**

js/src/database/qbe.js

@@ -1,13 +1,11 @@
 import $ from 'jquery';
+import { Functions } from '../functions.js';
 
 /**
  * @fileoverview    function used in QBE for DB
  * @name            Database Operations
  *
- * @requires    jQuery
  * @requires    jQueryUI
- * @requires    js/functions.js
- *
  */
 
 /**

js/src/database/query_generator.js

@@ -1,13 +1,11 @@
 import $ from 'jquery';
+import { Functions } from '../functions.js';
 
 /**
  * @fileoverview    function used in QBE for DB
  * @name            Database Operations
  *
- * @requires    jQuery
  * @requires    jQueryUI
- * @requires    js/functions.js
- *
  */
 
 function getFormatsText () {

js/src/database/routines.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from '../functions.js';
 
 /* global Navigation */
 

js/src/database/search.js

@@ -1,12 +1,10 @@
 import $ from 'jquery';
+import { Functions } from '../functions.js';
 import { CommonParams } from '../common.js';
 
 /**
  * JavaScript functions used on Database Search page
  *
- * @requires    jQuery
- * @requires    js/functions.js
- *
  * @package PhpMyAdmin
  */
 

js/src/database/structure.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from '../functions.js';
 import { CommonParams } from '../common.js';
 
 /* global Navigation */
@@ -7,9 +8,7 @@ import { CommonParams } from '../common.js';
  * @fileoverview    functions used on the database structure page
  * @name            Database Structure
  *
- * @requires    jQuery
  * @requires    jQueryUI
- * @required    js/functions.js
  */
 
 var DatabaseStructure = {};

js/src/database/tracking.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from '../functions.js';
 import { CommonParams } from '../common.js';
 
 /**

js/src/database/triggers.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from '../functions.js';
 
 /* global Navigation */
 

js/src/designer/database.js

@@ -1,3 +1,5 @@
+import { Functions } from '../functions.js';
+
 var designerTables = [
     {
         name: 'pdf_pages',

js/src/designer/history.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from '../functions.js';
 
 /**
  * @fileoverview    function used in this file builds history tab and generates query.

js/src/designer/move.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from '../functions.js';
 import { CommonActions, CommonParams } from '../common.js';
 
 /**

js/src/designer/page.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from '../functions.js';
 
 /* global DesignerOfflineDB */ // js/designer/database.js
 /* global DesignerMove */ // js/designer/move.js

js/src/drag_drop_import.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from './functions.js';
 import { CommonParams } from './common.js';
 
 /* This script handles PMA Drag Drop Import, loaded only when configuration is enabled.*/

js/src/error_report.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from './functions.js';
 import { CommonParams } from './common.js';
 
 /**

js/src/export.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from './functions.js';
 import { CommonParams } from './common.js';
 
 /**

js/src/gis_data_editor.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from './functions.js';
 import { CommonParams } from './common.js';
 
 /**

js/src/import.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from './functions.js';
 
 /**
  * Functions used in the import tab

js/src/indexes.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from './functions.js';
 import { CommonActions, CommonParams } from './common.js';
 
 /* global Navigation */
@@ -7,9 +8,7 @@ import { CommonActions, CommonParams } from './common.js';
  * @fileoverview    function used for index manipulation pages
  * @name            Table Structure
  *
- * @requires    jQuery
  * @requires    jQueryUI
- * @required    js/functions.js
  */
 
 var Indexes = {};

js/src/main.js

@@ -5,7 +5,7 @@ import { Navigation } from './navigation.js';
 
 /* global Indexes */
 
-AJAX.registerOnload('functions.js', () => AJAX.removeSubmitEvents());
+AJAX.registerOnload('main.js', () => AJAX.removeSubmitEvents());
 $(AJAX.loadEventHandler());
 
 /**
@@ -26,8 +26,8 @@ AJAX.registerOnload('config.js', window.Config.on());
 
 $.ajaxPrefilter(Functions.addNoCacheToAjaxRequests());
 
-AJAX.registerTeardown('functions.js', Functions.off());
-AJAX.registerOnload('functions.js', Functions.on());
+AJAX.registerTeardown('main.js', Functions.off());
+AJAX.registerOnload('main.js', Functions.on());
 
 $(Functions.dismissNotifications());
 $(Functions.initializeMenuResizer());

js/src/makegrid.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from './functions.js';
 import { CommonParams } from './common.js';
 
 /* global Sql */

js/src/menu_resizer.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from './functions.js';
 
 /**
  * Handles the resizing of a menu according to the available screen width

js/src/modules/console.js

@@ -1,9 +1,10 @@
 import $ from 'jquery';
 import CodeMirror from 'codemirror';
+import { Functions } from '../functions.js';
 import { CommonParams } from '../common.js';
 import { Config } from './console/config.js';
 
-/* global Functions, Navigation */
+/* global Navigation */
 
 /**
  * Console object

js/src/modules/console/config.js

@@ -1,4 +1,4 @@
-/* global Functions */
+import { Functions } from '../../functions.js';
 
 /**
  * @link https://docs.phpmyadmin.net/en/latest/config.html#console-settings

js/src/modules/git-info.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from '../functions.js';
 import { CommonParams } from '../common.js';
 
 const GitInfo = {

js/src/multi_column_sort.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from './functions.js';
 import { CommonParams } from './common.js';
 
 /**

js/src/normalization.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from './functions.js';
 import { CommonParams } from './common.js';
 
 /**

js/src/page_settings.js

@@ -4,9 +4,7 @@ import $ from 'jquery';
  * @fileoverview    function used for page-related settings
  * @name            Page-related settings
  *
- * @requires    jQuery
  * @requires    jQueryUI
- * @required    js/functions.js
  */
 
 function showSettings (selector) {

js/src/replication.js

@@ -1,12 +1,11 @@
 import $ from 'jquery';
+import { Functions } from './functions.js';
 
 /**
  * @fileoverview    Javascript functions used in server replication page
  * @name            Server Replication
  *
- * @requires    jQuery
  * @requires    jQueryUI
- * @requires    js/functions.js
  */
 
 var randomServerId = Math.floor(Math.random() * 10000000);

js/src/server/databases.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from '../functions.js';
 import { CommonActions, CommonParams } from '../common.js';
 
 /* global Navigation */

js/src/server/privileges.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from '../functions.js';
 import { CommonParams } from '../common.js';
 
 /* global Navigation */

js/src/server/status/monitor.js

@@ -1,13 +1,12 @@
 import $ from 'jquery';
+import { Functions } from '../../functions.js';
 import { CommonParams } from '../../common.js';
 
 /**
  * @fileoverview    Javascript functions used in server status monitor page
  * @name            Server Status Monitor
  *
- * @requires    jQuery
  * @requires    jQueryUI
- * @requires    js/functions.js
  */
 
 /* global firstDayOfCalendar, themeImagePath */ // templates/javascript/variables.twig

js/src/server/status/processes.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from '../../functions.js';
 import { CommonParams } from '../../common.js';
 
 /**

js/src/server/status/queries.js

@@ -1,12 +1,11 @@
 import $ from 'jquery';
+import { Functions } from '../../functions.js';
 
 /**
  * @fileoverview    Javascript functions used in server status query page
  * @name            Server Status Query
  *
- * @requires    jQuery
  * @requires    jQueryUI
- * @requires    js/functions.js
  */
 
 /* global initTableSorter */ // js/server/status/sorter.js

js/src/server/user_groups.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from '../functions.js';
 
 /**
  * @fileoverview    Javascript functions used in server user groups page

js/src/server/variables.js

@@ -1,13 +1,12 @@
 import $ from 'jquery';
+import { Functions } from '../functions.js';
 import { CommonParams } from '../common.js';
 
 /**
  * @fileoverview    Javascript functions used in server variables page
  * @name            Server Replication
  *
- * @requires    jQuery
  * @requires    jQueryUI
- * @requires    js/functions.js
  */
 /**
  * Unbind all event handlers before tearing down a page

js/src/sql.js

@@ -1,12 +1,10 @@
 import $ from 'jquery';
+import { Functions } from './functions.js';
 import { CommonActions, CommonParams } from './common.js';
 
 /**
  * @fileoverview    functions used wherever an sql query form is used
  *
- * @requires    jQuery
- * @requires    js/functions.js
- *
  * @test-module Sql
  */
 

js/src/table/change.js

@@ -1,12 +1,10 @@
 import $ from 'jquery';
+import { Functions } from '../functions.js';
 
 /**
  * @fileoverview    function used in table data manipulation pages
  *
- * @requires    jQuery
  * @requires    jQueryUI
- * @requires    js/functions.js
- *
  */
 
 /* global extendingValidatorMessages */ // templates/javascript/variables.twig

js/src/table/chart.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from '../functions.js';
 
 /* global ColumnType, DataTable, JQPlotChartFactory */ // js/chart.js
 

js/src/table/find_replace.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from '../functions.js';
 
 /**
  * Unbind all event handlers before tearing down a page

js/src/table/gis_visualization.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from '../functions.js';
 
 /**
  * @fileoverview    functions used for visualizing GIS data

js/src/table/operations.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from '../functions.js';
 import { CommonActions, CommonParams } from '../common.js';
 
 /* global Navigation */

js/src/table/relation.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from '../functions.js';
 import { CommonActions, CommonParams } from '../common.js';
 
 /**

js/src/table/select.js

@@ -1,11 +1,9 @@
 import $ from 'jquery';
+import { Functions } from '../functions.js';
 import { CommonParams } from '../common.js';
 
 /**
  * @fileoverview JavaScript functions used on /table/search
- *
- * @requires    jQuery
- * @requires    js/functions.js
  */
 
 /* global changeValueFieldType, verifyAfterSearchFieldChange */ // js/table/change.js

js/src/table/structure.js

@@ -1,13 +1,12 @@
 import $ from 'jquery';
+import { Functions } from '../functions.js';
 import { CommonActions, CommonParams } from '../common.js';
 
 /**
  * @fileoverview    functions used on the table structure page
  * @name            Table Structure
  *
- * @requires    jQuery
  * @requires    jQueryUI
- * @required    js/functions.js
  */
 
 /* global Navigation */

js/src/table/tracking.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from '../functions.js';
 import { CommonParams } from '../common.js';
 
 /**

js/src/table/zoom_plot_jqplot.js

@@ -1,12 +1,10 @@
 import $ from 'jquery';
+import { Functions } from '../functions.js';
 import { CommonParams } from '../common.js';
 
 // TODO: change the axis
 /**
  * @fileoverview JavaScript functions used on /table/search
- *
- * @requires    jQuery
- * @requires    js/functions.js
  **/
 
 /* global Sql */

js/src/transformations/sql_editor.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from '../functions.js';
 
 /**
  * SQL syntax highlighting transformation plugin js

js/src/u2f.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { Functions } from './functions.js';
 
 window.AJAX.registerOnload('u2f.js', function () {
     var $inputReg = $('#u2f_registration_response');

libraries/classes/Header.php

@@ -145,7 +145,6 @@ class Header
         $this->scripts->addFile('menu_resizer.js');
         $this->scripts->addFile('cross_framing_protection.js');
         $this->scripts->addFile('config.js');
-        $this->scripts->addFile('functions.js');
         $this->scripts->addFile('navigation.js');
         $this->scripts->addFile('indexes.js');
         $this->scripts->addFile('common.js');

libraries/classes/Plugins/Transformations/Output/Text_Plain_Sql.php

@@ -27,7 +27,6 @@ class Text_Plain_Sql extends SQLTransformationsPlugin
         $scripts->addFile('vendor/codemirror/lib/codemirror.js');
         $scripts->addFile('vendor/codemirror/mode/sql/sql.js');
         $scripts->addFile('vendor/codemirror/addon/runmode/runmode.js');
-        $scripts->addFile('functions.js');
     }
 
     /**

test/classes/HeaderTest.php

@@ -267,7 +267,6 @@ class HeaderTest extends AbstractTestCase
             ['name' => 'menu_resizer.js', 'fire' => 1],
             ['name' => 'cross_framing_protection.js', 'fire' => 0],
             ['name' => 'config.js', 'fire' => 1],
-            ['name' => 'functions.js', 'fire' => 1],
             ['name' => 'navigation.js', 'fire' => 1],
             ['name' => 'indexes.js', 'fire' => 1],
             ['name' => 'common.js', 'fire' => 1],

webpack.config.cjs

@@ -40,7 +40,6 @@ module.exports = [
             'error_report': './js/src/error_report.js',
             'export': './js/src/export.js',
             'export_output': './js/src/export_output.js',
-            'functions': './js/src/functions.js',
             'gis_data_editor': './js/src/gis_data_editor.js',
             'home': './js/src/home.js',
             'import': './js/src/import.js',