From de78e7911b80cde7305a7d0c90dcb7e54c963a54 Mon Sep 17 00:00:00 2001
From: Piyush Vijay <piyushvijay.1997@gmail.com>
Date: Thu, 26 Jul 2018 22:13:04 +0530
Subject: [PATCH] Bug fix for undefined variables and PMA_Console in working
 state now. Signed-Off-By: Piyush Vijay <piyushvijay.1997@gmail.com>

---
 js/src/classes/ErrorReport.js  | 2 +-
 js/src/console.js              | 8 +++++---
 js/src/functions/navigation.js | 2 +-
 js/src/index.js                | 5 +++++
 libraries/classes/Console.php  | 2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/js/src/classes/ErrorReport.js b/js/src/classes/ErrorReport.js
index 0ac0b69f9f..0aac56ab2d 100644
--- a/js/src/classes/ErrorReport.js
+++ b/js/src/classes/ErrorReport.js
@@ -8,7 +8,7 @@ import { PMA_commonParams } from '../variables/common_params';
 import { PMA_ajaxShowMessage } from '../utils/show_ajax_messages';
 import { PMA_getImage } from '../functions/get_image';
 import TraceKit from 'tracekit';
-import { jQuery as $ } from '../utils/extend_jquery';
+import { jQuery as $ } from '../utils/JqueryExtended';
 
 /**
  * This Object uses the library TraceKit to generate the backtrace of the
diff --git a/js/src/console.js b/js/src/console.js
index ae1e47d806..527989cd29 100644
--- a/js/src/console.js
+++ b/js/src/console.js
@@ -12,7 +12,7 @@ import PMA_consoleResizer from './classes/Console/PMA_ConsoleResizer';
 /**
  * Console object
  */
-export var PMA_console = {
+var PMA_console = {
     /**
      * @var object, jQuery object, selector is '#pma_console>.content'
      * @access private
@@ -290,7 +290,7 @@ export var PMA_console = {
         PMA_console.setConfig('Mode', 'show');
 
         var pmaConsoleHeight = Math.max(92, PMA_console.config.Height);
-        pmaConsoleHeight = Math.min(PMA_console.config.Height, (window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight)-25);
+        pmaConsoleHeight = Math.min(PMA_console.config.Height, (window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight) - 25);
         PMA_console.$consoleContent.css({ display:'block' });
         if (PMA_console.$consoleToolbar.hasClass('collapsed')) {
             PMA_console.$consoleToolbar.removeClass('collapsed');
@@ -414,4 +414,6 @@ export var PMA_console = {
         var reg_exp = /^SELECT\s+/i;
         return reg_exp.test(queryString);
     }
-}
+};
+
+export default PMA_console;
diff --git a/js/src/functions/navigation.js b/js/src/functions/navigation.js
index d8e8a4d6b9..38f8df16fd 100644
--- a/js/src/functions/navigation.js
+++ b/js/src/functions/navigation.js
@@ -146,7 +146,7 @@ export function PMA_showCurrentNavigation () {
 
     function isItemInContainer ($container, name, clazz) {
         var $whichItem = null;
-        $items = $container.find(clazz);
+        var $items = $container.find(clazz);
         var found = false;
         $items.each(function () {
             if ($(this).children('a').text() === name) {
diff --git a/js/src/index.js b/js/src/index.js
index 452a988f19..7b0d163306 100644
--- a/js/src/index.js
+++ b/js/src/index.js
@@ -2,6 +2,7 @@ import { AJAX } from './ajax';
 import './variables/import_variables';
 import { jQuery as $ } from './utils/JqueryExtended';
 import files from './consts/files';
+import Console from './console';
 
 /**
  * Page load event handler
@@ -84,3 +85,7 @@ if (typeof files[firstPage] !== 'undefined' && firstPage.toLocaleLowerCase() !==
         AJAX.scriptHandler.add(files[indexPage][i], 1);
     }
 }
+
+$(function () {
+    Console.initialize();
+});
diff --git a/libraries/classes/Console.php b/libraries/classes/Console.php
index 48dac1c2ad..f5672c1c89 100644
--- a/libraries/classes/Console.php
+++ b/libraries/classes/Console.php
@@ -124,7 +124,7 @@ class Console
      */
     public function getScripts(): array
     {
-        return ['console.js'];
+        return ['console'];
     }
 
     /**