webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-29 21:24:44 +03:00
Code Activity

Merge branch 'QA_4_4'

Browse Source 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne
2015-03-10 07:32:09 +05:30
parent b0805be729 102cd3c273
commit cbdafc1ba8
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
js/tbl_zoom_plot_jqplot.js
View File

@@ -142,7 +142,12 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () {
// Get query result
var searchedData = jQuery.parseJSON($('#querydata').html());
var searchedData;
try {
searchedData = jQuery.parseJSON($('#querydata').html());
} catch (err) {
searchedData = null;
}
/**
** Input form submit on field change

1
tbl_zoom_select.php
View File

@@ -30,6 +30,7 @@ $scripts->addFile('jqplot/plugins/jqplot.cursor.js');
$scripts->addFile('canvg/canvg.js');
$scripts->addFile('jquery/jquery-ui-timepicker-addon.js');
$scripts->addFile('tbl_zoom_plot_jqplot.js');
$scripts->addFile('tbl_change.js');
$table_search = new PMA_TableSearch($db, $table, "zoom");