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

Merge #16379 - Fix #16377 - Uncaught ReferenceError: Stickyfill is not defined

Browse Source 
Pull-request: #16379
Fixes: #16377

Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2020-10-02 13:31:40 +02:00
commit 2824e3ce25
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
7 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
db_search.php
View File

@ -35,6 +35,7 @@ $template = $containerBuilder->get('template');
$header = $response->getHeader();
$scripts = $header->getScripts();
$scripts->addFile('database/search.js');
$scripts->addFile('vendor/stickyfill.min.js');
$scripts->addFile('sql.js');
$scripts->addFile('makegrid.js');

1
db_sql.php
View File

@ -36,6 +36,7 @@ $header = $response->getHeader();
$scripts = $header->getScripts();
$scripts->addFile('makegrid.js');
$scripts->addFile('vendor/jquery/jquery.uitablefilter.js');
$scripts->addFile('vendor/stickyfill.min.js');
$scripts->addFile('sql.js');
$response->addHTML(

2
libraries/classes/Controllers/Table/SearchController.php
View File

@ -228,6 +228,7 @@ class SearchController extends AbstractController
->addFiles(
[
'makegrid.js',
'vendor/stickyfill.min.js',
'sql.js',
'table/select.js',
'table/change.js',
@ -260,6 +261,7 @@ class SearchController extends AbstractController
->addFiles(
[
'makegrid.js',
'vendor/stickyfill.min.js',
'sql.js',
'vendor/jqplot/jquery.jqplot.js',
'vendor/jqplot/plugins/jqplot.canvasTextRenderer.js',

3
libraries/classes/Sql.php
View File

@ -1473,6 +1473,7 @@ class Sql
if (is_array($profiling_results)) {
$header = $response->getHeader();
$scripts = $header->getScripts();
$scripts->addFile('vendor/stickyfill.min.js');
$scripts->addFile('sql.js');
$html_output .= $this->getHtmlForProfilingChart(
$url_query,
@ -1933,6 +1934,7 @@ class Sql
$tableMaintenanceHtml = '';
if (isset($_POST['table_maintenance'])) {
$scripts->addFile('makegrid.js');
$scripts->addFile('vendor/stickyfill.min.js');
$scripts->addFile('sql.js');
if (isset($message)) {
$message = is_string($message) ? Message::success($message) : $message;
@ -1962,6 +1964,7 @@ class Sql
if (! isset($_POST['printview']) || $_POST['printview'] != '1') {
$scripts->addFile('makegrid.js');
$scripts->addFile('vendor/stickyfill.min.js');
$scripts->addFile('sql.js');
unset($GLOBALS['message']);
//we don't need to buffer the output in getMessage here.

1
tbl_change.php
View File

@ -82,6 +82,7 @@ $comments_map = $insertEdit->getCommentsMap($db, $table);
$header = $response->getHeader();
$scripts = $header->getScripts();
$scripts->addFile('makegrid.js');
$scripts->addFile('vendor/stickyfill.min.js');
$scripts->addFile('sql.js');
$scripts->addFile('table/change.js');
$scripts->addFile('vendor/jquery/additional-methods.js');

1
tbl_replace.php
View File

@ -53,6 +53,7 @@ $header = $response->getHeader();
$scripts = $header->getScripts();
$scripts->addFile('makegrid.js');
// Needed for generation of Inline Edit anchors
$scripts->addFile('vendor/stickyfill.min.js');
$scripts->addFile('sql.js');
$scripts->addFile('indexes.js');
$scripts->addFile('gis_data_editor.js');

1
tbl_sql.php
View File

@ -36,6 +36,7 @@ $header = $response->getHeader();
$scripts = $header->getScripts();
$scripts->addFile('makegrid.js');
$scripts->addFile('vendor/jquery/jquery.uitablefilter.js');
$scripts->addFile('vendor/stickyfill.min.js');
$scripts->addFile('sql.js');
$response->addHTML(