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

Merge pull request #887 from nijel/remove-flashcanvas

Browse Source 
Drop flashcanvas
This commit is contained in:
Michal Čihař 2014-02-03 23:07:40 -08:00
commit 8219b4cc9c
5 changed files with 0 additions and 1105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1093
js/canvg/flashcanvas.js
View File

File diff suppressed because it is too large Load Diff

BIN
js/canvg/flashcanvas.swf
View File

Binary file not shown.

4
libraries/common.inc.php
View File

@ -1065,10 +1065,6 @@ if (! defined('PMA_MINIMUM_COMMON')) {
if (isset($_SESSION['profiling'])) {
$header = $response->getHeader();
$scripts = $header->getScripts();
/* < IE 9 doesn't support canvas natively */
if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER < 9) {
$scripts->addFile('canvg/flashcanvas.js');
}
$scripts->addFile('jqplot/jquery.jqplot.js');
$scripts->addFile('jqplot/plugins/jqplot.pieRenderer.js');
$scripts->addFile('jqplot/plugins/jqplot.highlighter.js');

4
tbl_chart.php
View File

@ -76,10 +76,6 @@ $scripts->addFile('jqplot/plugins/jqplot.dateAxisRenderer.js');
$scripts->addFile('jqplot/plugins/jqplot.pointLabels.js');
$scripts->addFile('jqplot/plugins/jqplot.pieRenderer.js');
$scripts->addFile('jqplot/plugins/jqplot.highlighter.js');
/* < IE 9 doesn't support canvas natively */
if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER < 9) {
$scripts->addFile('canvg/flashcanvas.js');
}
/**
* Runs common work

4
tbl_zoom_select.php
View File

@ -21,10 +21,6 @@ $header = $response->getHeader();
$scripts = $header->getScripts();
$scripts->addFile('makegrid.js');
$scripts->addFile('sql.js');
/* < IE 9 doesn't support canvas natively */
if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER < 9) {
$scripts->addFile('canvg/flashcanvas.js');
}
$scripts->addFile('jqplot/jquery.jqplot.js');
$scripts->addFile('jqplot/plugins/jqplot.canvasTextRenderer.js');
$scripts->addFile('jqplot/plugins/jqplot.canvasAxisLabelRenderer.js');