Edit php files for changes related to tbl_change.js

Signed-Off-By: Piyush Vijay <piyushvijay.1997@gmail.com>

js/src/consts/files.js

@@ -24,10 +24,10 @@ const PhpToJsFileMapping = {
     server_import: ['import'],
     db_search: ['db_search', 'sql'],
     server_sql: ['sql', 'multi_column_sort'],
-    tbl_sql: ['sql', 'multi_column_sort'],
+    tbl_sql: ['sql', 'multi_column_sort', 'tbl_change'],
     db_sql: ['sql', 'multi_column_sort'],
     sql: ['sql', 'multi_column_sort'],
-    db_structure: ['db_structure'],
+    db_structure: ['db_structure', 'tbl_change'],
     db_operations: ['db_operations'],
     db_tracking: ['db_tracking'],
     db_central_columns: ['db_central_columns'],
@@ -36,10 +36,14 @@ const PhpToJsFileMapping = {
     tbl_structure: ['tbl_structure'],
     tbl_indexes: [],
     tbl_relation: ['tbl_relation'],
-    tbl_replace: [],
+    tbl_replace: ['tbl_change', 'sql'],
     tbl_chart: ['tbl_chart'],
     tbl_operations: ['tbl_operations'],
-    tbl_tracking: ['tbl_tracking']
+    tbl_tracking: ['tbl_tracking'],
+    tbl_change: ['sql', 'tbl_change'],
+    tbl_select: ['sql', 'tbl_change'],
+    tbl_zoom_select: ['sql', 'tbl_change'],
+    tbl_find_replace: ['']
 };
 
 const JsFileList = [
@@ -75,7 +79,8 @@ const JsFileList = [
     'tbl_relation',
     'tbl_chart',
     'tbl_operations',
-    'tbl_tracking'
+    'tbl_tracking',
+    'tbl_change'
 ];
 
 export {

js/src/utils/DateTime.js

@@ -1,5 +1,6 @@
 import { PMA_Messages as PMA_messages } from '../variables/export_variables';
 import { PMA_tooltip } from './show_ajax_messages';
+import { $ } from './extend_jquery';
 /*
  * Adds a date/time picker to an element
  *
@@ -81,7 +82,7 @@ export function PMA_addDatepicker ($this_element, type, options) {
  * Add a date/time picker to each element that needs it
  * (only when jquery-ui-timepicker-addon.js is loaded)
  */
-function addDateTimePicker () {
+export function addDateTimePicker () {
     if ($.timepicker !== undefined) {
         $('input.timefield, input.datefield, input.datetimefield').each(function () {
             var decimals = $(this).parent().attr('data-decimals');

js/src/utils/JqueryExtended.js

@@ -1,10 +1,10 @@
 import $ from 'jquery';
 import 'jquery-migrate';
 import 'jquery-ui-bundle';
-import 'jquery-ui-timepicker-addon';
 import 'jquery-mousewheel';
 import 'jquery.event.drag';
 import 'jquery-validation';
+import 'jquery-ui-timepicker-addon';
 import '../plugins/jquery/jquery.uitablefilter';
 import { methods } from './menu_resizer';
 // TODO: To use this import for replacing variables used in this file for
@@ -231,15 +231,21 @@ if ($.timePicker) {
 }
 
 export function extendingValidatorMessages () {
+    var validateMessage;
+    var validateFormat;
     // Creating copy of validationMessage strings object
-    var validateMessage = Object.assign(window.validationMessage);
+    if (typeof window.validateMessage !== 'undefined') {
+        validateMessage = Object.assign(window.validationMessage);
+    }
     // Deleting validationMessage variable from window as it is of no use now
     delete window.validationMessage;
     // Replacing default validation messages forr localization
     $.extend($.validator.messages, validateMessage);
 
     // Creating copy of validationFormat strings object
-    var validateFormat = Object.assign(window.validationFormat);
+    if (typeof window.validationFormat !== 'undefined') {
+        validateFormat = Object.assign(window.validationFormat);
+    }
     // Deleting validationFormat variable from window as it is of no use now
     delete window.validationFormat;
     for (let i in validateFormat) {

libraries/classes/Controllers/Database/DatabaseStructureController.php

@@ -145,7 +145,7 @@ class DatabaseStructureController extends DatabaseController
         $this->response->getHeader()->getScripts()->addFiles(
             [
                 'db_structure',
-                'tbl_change.js',
+                'tbl_change',
             ]
         );
 

libraries/classes/Controllers/Table/TableSearchController.php

@@ -212,10 +212,9 @@ class TableSearchController extends TableController
                 ->getScripts()
                 ->addFiles(
                     [
-                        'makegrid.js',
-                        'sql.js',
+                        'sql',
                         'tbl_select.js',
-                        'tbl_change.js',
+                        'tbl_change',
                         'vendor/jquery/jquery.uitablefilter.js',
                         'gis_data_editor.js',
                     ]
@@ -244,8 +243,7 @@ class TableSearchController extends TableController
                 ->getScripts()
                 ->addFiles(
                     [
-                        'makegrid.js',
-                        'sql.js',
+                        'sql',
                         'vendor/jqplot/jquery.jqplot.js',
                         'vendor/jqplot/plugins/jqplot.canvasTextRenderer.js',
                         'vendor/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js',
@@ -253,7 +251,7 @@ class TableSearchController extends TableController
                         'vendor/jqplot/plugins/jqplot.highlighter.js',
                         'vendor/jqplot/plugins/jqplot.cursor.js',
                         'tbl_zoom_plot_jqplot.js',
-                        'tbl_change.js',
+                        'tbl_change',
                     ]
                 );
 

sql.php

@@ -27,7 +27,7 @@ PageSettings::showGroup('Browse');
 $response = Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
-$scripts->addFile('tbl_change.js');
+$scripts->addFile('tbl_change');
 $scripts->addFile('indexes');
 $scripts->addFile('gis_data_editor.js');
 $scripts->addFile('multi_column_sort');

tbl_change.php

@@ -74,9 +74,8 @@ $comments_map = $insertEdit->getCommentsMap($db, $table);
 $response = Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
-$scripts->addFile('sql.js');
-$scripts->addFile('tbl_change.js');
-$scripts->addFile('vendor/jquery/additional-methods.js');
+$scripts->addFile('sql');
+$scripts->addFile('tbl_change');
 $scripts->addFile('gis_data_editor.js');
 
 /**

tbl_replace.php

@@ -42,9 +42,8 @@ $goto_include = false;
 $response = Response::getInstance();
 $header = $response->getHeader();
 $scripts = $header->getScripts();
-$scripts->addFile('makegrid.js');
 // Needed for generation of Inline Edit anchors
-$scripts->addFile('sql.js');
+$scripts->addFile('sql');
 $scripts->addFile('indexes');
 $scripts->addFile('gis_data_editor.js');
 
@@ -515,8 +514,7 @@ if (! empty($return_to_sql_query)) {
     $GLOBALS['sql_query'] = $return_to_sql_query;
 }
 
-$scripts->addFile('vendor/jquery/additional-methods.js');
-$scripts->addFile('tbl_change.js');
+$scripts->addFile('tbl_change');
 
 $active_page = $goto_include;