Resolving merge errors.

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

.eslintignore

@@ -3,3 +3,4 @@ tmp/
 vendor/
 js/dist/
 js/lib/
+js/src/plugins/

db_search.php

@@ -22,8 +22,7 @@ $response = Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('db_search');
-$scripts->addFile('sql.js');
-// $scripts->addFile('makegrid.js');
+$scripts->addFile('sql');
 
 require 'libraries/db_common.inc.php';
 

js/src/ajax.js

@@ -8,7 +8,7 @@ import { PMA_ajaxShowMessage,
 } from './utils/show_ajax_messages';
 import { PMA_Messages as PMA_messages } from './variables/export_variables';
 import CommonParams from './variables/common_params';
-import { jQuery as $ } from './utils/JqueryExtended';
+import { $ } from './utils/JqueryExtended';
 import { PMA_getImage } from './functions/get_image';
 import { PMA_ensureNaviSettings,
     PMA_reloadNavigation,

js/src/classes/Chart.js

@@ -1,4 +1,4 @@
-import { $ } from '../utils/extend_jquery';
+import { $ } from '../utils/JqueryExtended';
 import 'updated-jqplot';
 import 'updated-jqplot/dist/plugins/jqplot.pieRenderer';
 import 'updated-jqplot/dist/plugins/jqplot.highlighter';

js/src/config.js

@@ -31,7 +31,7 @@ function onloadConfigPrefsTab () {
 // Form validation and field operations
 //
 
-export function onload2 () {
+function onloadConfigValidations () {
     Config.setupValidation();
 }
 
@@ -43,7 +43,7 @@ export function onload2 () {
 // Tabbed forms
 //
 
-export function onload3 () {
+function onloadConfigTabs () {
     Config.setupConfigTabs();
     Config.adjustPrefsNotification();
 
@@ -91,7 +91,7 @@ function onloadConfigResetDefault () {
 // "Restore default" and "set value" buttons
 //
 
-export function onload5 () {
+function onloadConfigRestore () {
     Config.setupRestoreField();
 }
 
@@ -103,7 +103,7 @@ export function onload5 () {
 // User preferences import/export
 //
 
-export function onload6 () {
+function onloadPreferenceExport () {
     Config.offerPrefsAutoimport();
     var $radios = $('#import_local_storage, #export_local_storage');
     if (!$radios.length) {

js/src/export.js

@@ -251,7 +251,7 @@ function onloadExportOptions () {
             .parent()
             .fadeTo('fast', 0.4);
 
-            Export.setupTableStructureOrData();
+        Export.setupTableStructureOrData();
     }
 
     /**

js/src/functions/Grid/Cell.js

@@ -13,4 +13,4 @@ export function PMA_getCellValue (td) {
     } else {
         return $td.text();
     }
-}
+}

js/src/functions/Grid/GetFieldName.js

@@ -38,4 +38,4 @@ export function getFieldName ($table_results, $this_field) {
     field_name = $.trim(field_name);
 
     return field_name;
-}
+}

js/src/functions/Server/SeverStatusSorter.js

@@ -3,7 +3,7 @@
 /**
  * Module import
  */
-import { $ } from '../../utils/extend_jquery';
+import { $ } from '../../utils/JqueryExtended';
 import '../../plugins/jquery/jquery.tablesorter';
 // TODO: tablesorter shouldn't sort already sorted columns
 /**

js/src/functions/chart.js

@@ -2,7 +2,7 @@
  * Creates a Profiling Chart. Used in sql.js
  * and in server_status_monitor.js
  */
-import { $ } from '../utils/extend_jquery';
+import { $ } from '../utils/JqueryExtended';
 import JQPlotChartFactory from '../classes/Chart';
 import { ChartType, ColumnType, DataTable } from '../classes/Chart';
 

js/src/server_databases.js

@@ -16,11 +16,7 @@ import './variables/import_variables';
 import { PMA_ajaxShowMessage } from './utils/show_ajax_messages';
 import { escapeHtml } from './utils/Sanitise';
 import { PMA_Messages as messages } from './variables/export_variables';
-<<<<<<< HEAD
-import { jQuery as $ } from './utils/JqueryExtended';
-=======
-import { $ } from './utils/extend_jquery';
->>>>>>> Weekly progress.
+import { $ } from './utils/JqueryExtended';
 import { AJAX } from './ajax';
 import CommonParams from './variables/common_params';
 import { PMA_reloadNavigation } from './functions/navigation';

js/src/server_plugins.js

@@ -3,7 +3,7 @@
 /**
  * Module import
  */
-import { $ } from './utils/extend_jquery';
+import { $ } from './utils/JqueryExtended';
 import './plugins/jquery/jquery.tablesorter';
 
 /**

js/src/server_status_monitor.js

@@ -1,6 +1,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 import { PMA_Messages as messages } from './variables/export_variables';
-import { $ } from './utils/extend_jquery';
+import { $ } from './utils/JqueryExtended';
 
 import 'updated-jqplot';
 import './plugins/jquery/jquery.sortableTable';

js/src/server_variables.js

@@ -3,7 +3,7 @@
 /**
  * Module import
  */
-import { $ } from './utils/extend_jquery';
+import { $ } from './utils/JqueryExtended';
 import { editVariable } from './functions/Server/ServerVariables';
 
 /**

js/src/sql.js

@@ -1,5 +1,5 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-import { $ } from './utils/extend_jquery';
+import { $ } from './utils/JqueryExtended';
 import './plugins/jquery/jquery.uitablefilter';
 import { PMA_Messages as PMA_messages } from './variables/export_variables';
 import PMA_commonParams from './variables/common_params';

js/src/utils/JqueryExtended.js

@@ -15,7 +15,7 @@ import { PMA_Messages as PMA_messages } from '../variables/export_variables';
  * Make sure that ajax requests will not be cached
  * by appending a random variable to their parameters
  */
-$.ajaxPrefilter(function (options, originalOptions, jqXHR) {
+$.ajaxPrefilter(function (options, originalOptions) {
     var nocache = new Date().getTime() + '' + Math.floor(Math.random() * 1000000);
     if (typeof options.data === 'string') {
         options.data += '&_nocache=' + nocache + '&token=' + encodeURIComponent(PMA_commonParams.get('token'));
@@ -250,4 +250,6 @@ export function extendingValidatorMessages () {
 
 window.jQ = $;
 
-export const jQuery = $;
+export {
+    $
+};

js/src/utils/makegrid.js

@@ -3,7 +3,7 @@
 /**
  * Module import
  */
-import { $ } from './extend_jquery';
+import { $ } from './JqueryExtended';
 import { PMA_Messages as messages } from '../variables/export_variables';
 import { PMA_ajaxShowMessage, PMA_tooltip } from './show_ajax_messages';
 import { rearrangeStickyColumns } from '../functions/Grid/StickyColumns';

js/src/utils/menu_resizer.js

@@ -4,7 +4,7 @@
  * Module import
  */
 import { PMA_getImage } from '../functions/get_image';
-import { PMA_messages as messages } from '../variables/export_variables';
+import { PMA_Messages as messages } from '../variables/export_variables';
 /**
  * Handles the resizing of a menu according to the available screen width
  *

server_sql.php

@@ -24,8 +24,6 @@ PageSettings::showGroup('Sql');
 $response = Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
-// $scripts->addFile('makegrid.js');
-// $scripts->addFile('vendor/jquery/jquery.uitablefilter.js');
 $scripts->addFile('sql');
 
 require_once 'libraries/server_common.inc.php';

test/classes/ScriptsTest.php

@@ -125,12 +125,16 @@ class ScriptsTest extends PmaTestCase
     public function testAddCodeNew()
     {
 
-        $this->object->addCode('alert(\'CodeAdded\');');
+        $this->object->addCodeNew('alert(\'CodeAdded\');');
 
         $this->assertEquals(
-            '<script data-cfasync="false" type="text/javascript">// <![CDATA[
-            alert(\'CodeAdded\');
-            // ]]></script>',
+            '<script data-cfasync="false" type="text/javascript">// <![CDATA[' . "\n"
+            . 'alert(\'CodeAdded\');' . "\n"
+            . '// ]]></script>'
+            . '<script data-cfasync="false" type="text/javascript">// <![CDATA[' . "\n"
+            . 'AJAX.scriptHandler;' . "\n"
+            . '$(function() {});' . "\n"
+            . '// ]]></script>',
             $this->object->getDisplay()
         );
     }
@@ -146,11 +150,13 @@ class ScriptsTest extends PmaTestCase
         $this->object->addCode('alert(\'CodeAdded\');');
 
         $this->assertEquals(
-            '<script data-cfasync="false" type="text/javascript">// <![CDATA[
-            alert(\'CodeAdded\');
-            AJAX.scriptHandler;
-            $(function() {});
-            // ]]></script>',
+            '<script data-cfasync="false" type="text/javascript">// <![CDATA[' . "\n"
+            . '// ]]></script>'
+            . '<script data-cfasync="false" type="text/javascript">// <![CDATA[' . "\n"
+            . 'alert(\'CodeAdded\');' . "\n"
+            . 'AJAX.scriptHandler;' . "\n"
+            . '$(function() {});' . "\n"
+            . '// ]]></script>',
             $this->object->getDisplay()
         );
     }