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

Merge branch 'QA_3_5-jqplot' into QA_3_5

Browse Source
This commit is contained in:
Atul Pratap Singh 2012-09-22 16:30:58 +05:30
commit d1a7a8560a
2 changed files with 1439 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1438
js/jqplot/excanvas.js Normal file
View File

File diff suppressed because it is too large Load Diff

2
server_status.php
View File

@ -423,7 +423,7 @@ $GLOBALS['js_include'][] = 'jquery/jquery.tablesorter.js';
$GLOBALS['js_include'][] = 'jquery/jquery.cookie.js'; // For tab persistence
/* < IE 9 doesn't support canvas natively */
if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER < 9) {
$GLOBALS['js_include'][] = 'canvg/flashcanvas.js';
$GLOBALS['js_include'][] = 'jqplot/excanvas.js';
}
$GLOBALS['js_include'][] = 'canvg/canvg.js';
// for charting