From 382b72fdd8473970c3d93ab3d441d0f8256a82b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Wed, 30 Nov 2022 23:41:42 -0300 Subject: [PATCH] Move config.js to modules/config.js MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: MaurĂ­cio Meneghini Fauth --- js/src/main.js | 2 +- js/src/{ => modules}/config.js | 4 ++-- js/src/modules/functions.js | 2 +- js/src/modules/navigation.js | 2 +- js/src/server/status/monitor.js | 2 +- js/src/setup/scripts.js | 2 +- js/src/sql.js | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename js/src/{ => modules}/config.js (99%) diff --git a/js/src/main.js b/js/src/main.js index 65b235fbec..3b211d3ea8 100644 --- a/js/src/main.js +++ b/js/src/main.js @@ -6,7 +6,7 @@ import { Navigation } from './modules/navigation.js'; import { PageSettings } from './modules/page_settings.js'; import { crossFramingProtection } from './modules/cross_framing_protection.js'; import { Indexes } from './modules/indexes.js'; -import { Config } from './config.js'; +import { Config } from './modules/config.js'; AJAX.registerOnload('main.js', () => AJAX.removeSubmitEvents()); $(AJAX.loadEventHandler()); diff --git a/js/src/config.js b/js/src/modules/config.js similarity index 99% rename from js/src/config.js rename to js/src/modules/config.js index 2cd8851fa6..1d4a683da8 100644 --- a/js/src/config.js +++ b/js/src/modules/config.js @@ -1,6 +1,6 @@ import $ from 'jquery'; -import { Functions } from './modules/functions.js'; -import { CommonParams } from './common.js'; +import { Functions } from './functions.js'; +import { CommonParams } from '../common.js'; /** * Functions used in configuration forms and on user preferences pages diff --git a/js/src/modules/functions.js b/js/src/modules/functions.js index d334532037..15e0b50a79 100644 --- a/js/src/modules/functions.js +++ b/js/src/modules/functions.js @@ -4,7 +4,7 @@ import { Navigation } from './navigation.js'; import { CommonActions, CommonParams } from '../common.js'; import { mysqlDocKeyword, mysqlDocBuiltin } from './doc-links.js'; import { Indexes } from './indexes.js'; -import { Config } from '../config.js'; +import { Config } from './config.js'; /* global ChartType, ColumnType, DataTable, JQPlotChartFactory */ // js/chart.js /* global DatabaseStructure */ // js/database/structure.js diff --git a/js/src/modules/navigation.js b/js/src/modules/navigation.js index bca7366f2d..ed58f19c52 100644 --- a/js/src/modules/navigation.js +++ b/js/src/modules/navigation.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import { Functions } from './functions.js'; import { CommonParams } from '../common.js'; -import { Config } from '../config.js'; +import { Config } from './config.js'; /** * function used in or for navigation panel diff --git a/js/src/server/status/monitor.js b/js/src/server/status/monitor.js index e0d24aeae3..b893a23903 100644 --- a/js/src/server/status/monitor.js +++ b/js/src/server/status/monitor.js @@ -2,7 +2,7 @@ import $ from 'jquery'; import { AJAX } from '../../modules/ajax.js'; import { Functions } from '../../modules/functions.js'; import { CommonParams } from '../../common.js'; -import { Config } from '../../config.js'; +import { Config } from '../../modules/config.js'; /** * @fileoverview Javascript functions used in server status monitor page diff --git a/js/src/setup/scripts.js b/js/src/setup/scripts.js index df073e7b10..a7520c775d 100644 --- a/js/src/setup/scripts.js +++ b/js/src/setup/scripts.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import { Config } from '../config.js'; +import { Config } from '../modules/config.js'; /** * Functions used in Setup configuration forms diff --git a/js/src/sql.js b/js/src/sql.js index 6ea1824ac3..2cfd0c883a 100644 --- a/js/src/sql.js +++ b/js/src/sql.js @@ -3,7 +3,7 @@ import { AJAX } from './modules/ajax.js'; import { Functions } from './modules/functions.js'; import { Navigation } from './modules/navigation.js'; import { CommonActions, CommonParams } from './common.js'; -import { Config } from './config.js'; +import { Config } from './modules/config.js'; /** * @fileoverview functions used wherever an sql query form is used