diff options
| author | Maurício Meneghini Fauth <mauricio@fauth.dev> | 2022-07-05 21:47:12 +0300 |
|---|---|---|
| committer | Maurício Meneghini Fauth <mauricio@fauth.dev> | 2022-07-05 21:47:12 +0300 |
| commit | 431b594ec3d5d82cc2ec4bbea8766839181d6b18 (patch) | |
| tree | 7a0487fa7309fa8102673d235b111e453f904995 | |
| parent | af6b22d67511ae9241315e90605c04035ee4ff88 (diff) | |
Change doclinks.js to use JS modules
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
| -rw-r--r-- | js/src/functions.js | 2 | ||||
| -rw-r--r-- | js/src/modules/doc-links.js (renamed from js/src/doclinks.js) | 6 | ||||
| -rw-r--r-- | libraries/classes/Header.php | 1 | ||||
| -rw-r--r-- | webpack.config.cjs | 1 |
4 files changed, 3 insertions, 7 deletions
diff --git a/js/src/functions.js b/js/src/functions.js index d0de8d4a6e..4becba39e2 100644 --- a/js/src/functions.js +++ b/js/src/functions.js @@ -1,9 +1,9 @@ import $ from 'jquery'; +import { mysqlDocKeyword, mysqlDocBuiltin } from './modules/doc-links.js'; /* global Navigation */ /* global ChartType, ColumnType, DataTable, JQPlotChartFactory */ // js/chart.js /* global DatabaseStructure */ // js/database/structure.js -/* global mysqlDocBuiltin, mysqlDocKeyword */ // js/doclinks.js /* global Indexes */ // js/indexes.js /* global firstDayOfCalendar, maxInputVars, mysqlDocTemplate, themeImagePath */ // templates/javascript/variables.twig diff --git a/js/src/doclinks.js b/js/src/modules/doc-links.js index 52b09d1b3c..3354ec1afe 100644 --- a/js/src/doclinks.js +++ b/js/src/modules/doc-links.js @@ -2,7 +2,7 @@ * Definition of links to MySQL documentation. */ -var mysqlDocKeyword = { +export const mysqlDocKeyword = { /* Multi word */ 'CHARACTER SET': ['charset'], 'SHOW AUTHORS': ['show-authors'], @@ -329,9 +329,8 @@ var mysqlDocKeyword = { 'COUNT_DISTINCT': ['aggregate-functions', 'function_count-distinct'], 'NOT_IN': ['comparison-operators', 'function_not-in'] }; -window.mysqlDocKeyword = mysqlDocKeyword; -var mysqlDocBuiltin = { +export const mysqlDocBuiltin = { 'TINYINT': ['numeric-types'], 'SMALLINT': ['numeric-types'], 'MEDIUMINT': ['numeric-types'], @@ -364,4 +363,3 @@ var mysqlDocBuiltin = { 'ENUM': ['string-types'], 'SET': ['string-types'] }; -window.mysqlDocBuiltin = mysqlDocBuiltin; diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php index b0a469987c..85bc1dcd10 100644 --- a/libraries/classes/Header.php +++ b/libraries/classes/Header.php @@ -143,7 +143,6 @@ class Header $this->scripts->addFile('cross_framing_protection.js'); $this->scripts->addFile('messages.php', ['l' => $GLOBALS['lang']]); $this->scripts->addFile('config.js'); - $this->scripts->addFile('doclinks.js'); $this->scripts->addFile('functions.js'); $this->scripts->addFile('navigation.js'); $this->scripts->addFile('indexes.js'); diff --git a/webpack.config.cjs b/webpack.config.cjs index 78c4847fda..e488adafbb 100644 --- a/webpack.config.cjs +++ b/webpack.config.cjs @@ -36,7 +36,6 @@ module.exports = [ 'designer/move': './js/src/designer/move.js', 'designer/objects': './js/src/designer/objects.js', 'designer/page': './js/src/designer/page.js', - 'doclinks': './js/src/doclinks.js', 'drag_drop_import': './js/src/drag_drop_import.js', 'error_report': './js/src/error_report.js', 'export': './js/src/export.js', |