gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fix for undefined variables and PMA_Console in working state now.

Browse Source 
Signed-Off-By: Piyush Vijay <piyushvijay.1997@gmail.com>
This commit is contained in:
Piyush Vijay 2018-07-26 22:13:04 +05:30
parent e18c6b9818
commit de78e7911b
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/classes/ErrorReport.js
View File

@ -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

8
js/src/console.js
View File

@ -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;

2
js/src/functions/navigation.js
View File

@ -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) {

5
js/src/index.js
View File

@ -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();
});

2
libraries/classes/Console.php
View File

@ -124,7 +124,7 @@ class Console
*/
public function getScripts(): array
{
return ['console.js'];
return ['console'];
}
/**