From 47865ee3bb6383a2f8907a732a353ed93ebada60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?=
 <mauriciofauth@gmail.com>
Date: Wed, 14 Jun 2017 01:50:41 -0300
Subject: [PATCH] Move jqPlot to js/vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Move js/jqplot to js/vendor/jqplot

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
---
 .scrutinizer.yml                              |  4 ++--
 build.xml                                     |  2 +-
 js/{ => vendor}/jqplot/jquery.jqplot.js       |  0
 .../jqplot/plugins/jqplot.barRenderer.js      |  0
 .../plugins/jqplot.canvasAxisLabelRenderer.js |  0
 .../plugins/jqplot.canvasTextRenderer.js      |  0
 .../plugins/jqplot.categoryAxisRenderer.js    |  0
 .../jqplot/plugins/jqplot.cursor.js           |  0
 .../jqplot/plugins/jqplot.dateAxisRenderer.js |  0
 .../jqplot.enhancedPieLegendRenderer.js       |  0
 .../jqplot/plugins/jqplot.highlighter.js      |  0
 .../jqplot/plugins/jqplot.pieRenderer.js      |  0
 .../jqplot/plugins/jqplot.pointLabels.js      |  0
 libraries/common.inc.php                      |  6 +++---
 .../table/TableChartController.php            | 20 +++++++++----------
 .../table/TableSearchController.php           | 12 +++++------
 server_status_monitor.php                     | 16 +++++++--------
 server_status_queries.php                     |  8 ++++----
 18 files changed, 34 insertions(+), 34 deletions(-)
 rename js/{ => vendor}/jqplot/jquery.jqplot.js (100%)
 rename js/{ => vendor}/jqplot/plugins/jqplot.barRenderer.js (100%)
 rename js/{ => vendor}/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js (100%)
 rename js/{ => vendor}/jqplot/plugins/jqplot.canvasTextRenderer.js (100%)
 rename js/{ => vendor}/jqplot/plugins/jqplot.categoryAxisRenderer.js (100%)
 rename js/{ => vendor}/jqplot/plugins/jqplot.cursor.js (100%)
 rename js/{ => vendor}/jqplot/plugins/jqplot.dateAxisRenderer.js (100%)
 rename js/{ => vendor}/jqplot/plugins/jqplot.enhancedPieLegendRenderer.js (100%)
 rename js/{ => vendor}/jqplot/plugins/jqplot.highlighter.js (100%)
 rename js/{ => vendor}/jqplot/plugins/jqplot.pieRenderer.js (100%)
 rename js/{ => vendor}/jqplot/plugins/jqplot.pointLabels.js (100%)

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index e8d5f211be..1c614bd876 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -3,7 +3,7 @@ imports:
     - javascript
     - php
 filter:
-    excluded_paths: [js/vendor/*, js/jqplot/*, js/codemirror/*, js/sprintf.js]
+    excluded_paths: [js/vendor/*, js/codemirror/*, js/sprintf.js]
 build:
     dependencies:
         before:
@@ -12,7 +12,7 @@ build:
     tests:
         override:
             -
-                command: './vendor/bin/phpcs  --standard=PMAStandard ./ --report=checkstyle --report-file=cs-data --ignore=*/vendor/*,*/codemirror/*,*/jqplot/*,*/build/*'
+                command: './vendor/bin/phpcs  --standard=PMAStandard ./ --report=checkstyle --report-file=cs-data --ignore=*/vendor/*,*/codemirror/*,*/build/*'
                 analysis:
                     file: 'cs-data'                 # The reporter filename
                     format: 'php-cs-checkstyle'     # The supported format by Scrutinizer
diff --git a/build.xml b/build.xml
index 0ebf798258..f9a89e35b9 100644
--- a/build.xml
+++ b/build.xml
@@ -89,7 +89,7 @@
  <target name="phpcs" description="Generate checkstyle.xml using PHP_CodeSniffer excluding third party libraries" depends="phpcs-config">
   <exec executable="phpcs">
    <arg line="
-              --ignore=*/vendor/*,*/codemirror/*,*/jqplot/*,*/build/*
+              --ignore=*/vendor/*,*/codemirror/*,*/build/*
               --report=checkstyle
               --extensions=php
               --report-file='${basedir}/build/logs/checkstyle.xml'
diff --git a/js/jqplot/jquery.jqplot.js b/js/vendor/jqplot/jquery.jqplot.js
similarity index 100%
rename from js/jqplot/jquery.jqplot.js
rename to js/vendor/jqplot/jquery.jqplot.js
diff --git a/js/jqplot/plugins/jqplot.barRenderer.js b/js/vendor/jqplot/plugins/jqplot.barRenderer.js
similarity index 100%
rename from js/jqplot/plugins/jqplot.barRenderer.js
rename to js/vendor/jqplot/plugins/jqplot.barRenderer.js
diff --git a/js/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js b/js/vendor/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js
similarity index 100%
rename from js/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js
rename to js/vendor/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js
diff --git a/js/jqplot/plugins/jqplot.canvasTextRenderer.js b/js/vendor/jqplot/plugins/jqplot.canvasTextRenderer.js
similarity index 100%
rename from js/jqplot/plugins/jqplot.canvasTextRenderer.js
rename to js/vendor/jqplot/plugins/jqplot.canvasTextRenderer.js
diff --git a/js/jqplot/plugins/jqplot.categoryAxisRenderer.js b/js/vendor/jqplot/plugins/jqplot.categoryAxisRenderer.js
similarity index 100%
rename from js/jqplot/plugins/jqplot.categoryAxisRenderer.js
rename to js/vendor/jqplot/plugins/jqplot.categoryAxisRenderer.js
diff --git a/js/jqplot/plugins/jqplot.cursor.js b/js/vendor/jqplot/plugins/jqplot.cursor.js
similarity index 100%
rename from js/jqplot/plugins/jqplot.cursor.js
rename to js/vendor/jqplot/plugins/jqplot.cursor.js
diff --git a/js/jqplot/plugins/jqplot.dateAxisRenderer.js b/js/vendor/jqplot/plugins/jqplot.dateAxisRenderer.js
similarity index 100%
rename from js/jqplot/plugins/jqplot.dateAxisRenderer.js
rename to js/vendor/jqplot/plugins/jqplot.dateAxisRenderer.js
diff --git a/js/jqplot/plugins/jqplot.enhancedPieLegendRenderer.js b/js/vendor/jqplot/plugins/jqplot.enhancedPieLegendRenderer.js
similarity index 100%
rename from js/jqplot/plugins/jqplot.enhancedPieLegendRenderer.js
rename to js/vendor/jqplot/plugins/jqplot.enhancedPieLegendRenderer.js
diff --git a/js/jqplot/plugins/jqplot.highlighter.js b/js/vendor/jqplot/plugins/jqplot.highlighter.js
similarity index 100%
rename from js/jqplot/plugins/jqplot.highlighter.js
rename to js/vendor/jqplot/plugins/jqplot.highlighter.js
diff --git a/js/jqplot/plugins/jqplot.pieRenderer.js b/js/vendor/jqplot/plugins/jqplot.pieRenderer.js
similarity index 100%
rename from js/jqplot/plugins/jqplot.pieRenderer.js
rename to js/vendor/jqplot/plugins/jqplot.pieRenderer.js
diff --git a/js/jqplot/plugins/jqplot.pointLabels.js b/js/vendor/jqplot/plugins/jqplot.pointLabels.js
similarity index 100%
rename from js/jqplot/plugins/jqplot.pointLabels.js
rename to js/vendor/jqplot/plugins/jqplot.pointLabels.js
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 125d90599a..e67959f887 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -859,9 +859,9 @@ if (! defined('PMA_MINIMUM_COMMON')) {
         $header   = $response->getHeader();
         $scripts  = $header->getScripts();
         $scripts->addFile('chart.js');
-        $scripts->addFile('jqplot/jquery.jqplot.js');
-        $scripts->addFile('jqplot/plugins/jqplot.pieRenderer.js');
-        $scripts->addFile('jqplot/plugins/jqplot.highlighter.js');
+        $scripts->addFile('vendor/jqplot/jquery.jqplot.js');
+        $scripts->addFile('vendor/jqplot/plugins/jqplot.pieRenderer.js');
+        $scripts->addFile('vendor/jqplot/plugins/jqplot.highlighter.js');
         $scripts->addFile('vendor/jquery/jquery.tablesorter.js');
     }
 
diff --git a/libraries/controllers/table/TableChartController.php b/libraries/controllers/table/TableChartController.php
index fc5b314a68..c37845088a 100644
--- a/libraries/controllers/table/TableChartController.php
+++ b/libraries/controllers/table/TableChartController.php
@@ -85,16 +85,16 @@ class TableChartController extends TableController
             array(
                 'chart.js',
                 'tbl_chart.js',
-                'jqplot/jquery.jqplot.js',
-                'jqplot/plugins/jqplot.barRenderer.js',
-                'jqplot/plugins/jqplot.canvasAxisLabelRenderer.js',
-                'jqplot/plugins/jqplot.canvasTextRenderer.js',
-                'jqplot/plugins/jqplot.categoryAxisRenderer.js',
-                'jqplot/plugins/jqplot.dateAxisRenderer.js',
-                'jqplot/plugins/jqplot.pointLabels.js',
-                'jqplot/plugins/jqplot.pieRenderer.js',
-                'jqplot/plugins/jqplot.enhancedPieLegendRenderer.js',
-                'jqplot/plugins/jqplot.highlighter.js'
+                'vendor/jqplot/jquery.jqplot.js',
+                'vendor/jqplot/plugins/jqplot.barRenderer.js',
+                'vendor/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js',
+                'vendor/jqplot/plugins/jqplot.canvasTextRenderer.js',
+                'vendor/jqplot/plugins/jqplot.categoryAxisRenderer.js',
+                'vendor/jqplot/plugins/jqplot.dateAxisRenderer.js',
+                'vendor/jqplot/plugins/jqplot.pointLabels.js',
+                'vendor/jqplot/plugins/jqplot.pieRenderer.js',
+                'vendor/jqplot/plugins/jqplot.enhancedPieLegendRenderer.js',
+                'vendor/jqplot/plugins/jqplot.highlighter.js'
             )
         );
 
diff --git a/libraries/controllers/table/TableSearchController.php b/libraries/controllers/table/TableSearchController.php
index 65ada9fad9..8db5f794e9 100644
--- a/libraries/controllers/table/TableSearchController.php
+++ b/libraries/controllers/table/TableSearchController.php
@@ -226,12 +226,12 @@ class TableSearchController extends TableController
                     array(
                         'makegrid.js',
                         'sql.js',
-                        'jqplot/jquery.jqplot.js',
-                        'jqplot/plugins/jqplot.canvasTextRenderer.js',
-                        'jqplot/plugins/jqplot.canvasAxisLabelRenderer.js',
-                        'jqplot/plugins/jqplot.dateAxisRenderer.js',
-                        'jqplot/plugins/jqplot.highlighter.js',
-                        'jqplot/plugins/jqplot.cursor.js',
+                        'vendor/jqplot/jquery.jqplot.js',
+                        'vendor/jqplot/plugins/jqplot.canvasTextRenderer.js',
+                        'vendor/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js',
+                        'vendor/jqplot/plugins/jqplot.dateAxisRenderer.js',
+                        'vendor/jqplot/plugins/jqplot.highlighter.js',
+                        'vendor/jqplot/plugins/jqplot.cursor.js',
                         'vendor/jquery/jquery-ui-timepicker-addon.js',
                         'tbl_zoom_plot_jqplot.js',
                         'tbl_change.js',
diff --git a/server_status_monitor.php b/server_status_monitor.php
index 01c940b048..6a32d1d3e5 100644
--- a/server_status_monitor.php
+++ b/server_status_monitor.php
@@ -74,14 +74,14 @@ $scripts->addFile('vendor/jquery/jquery.tablesorter.js');
 $scripts->addFile('vendor/jquery/jquery.sortableTable.js');
 $scripts->addFile('vendor/jquery/jquery-ui-timepicker-addon.js');
 // for charting
-$scripts->addFile('jqplot/jquery.jqplot.js');
-$scripts->addFile('jqplot/plugins/jqplot.pieRenderer.js');
-$scripts->addFile('jqplot/plugins/jqplot.enhancedPieLegendRenderer.js');
-$scripts->addFile('jqplot/plugins/jqplot.canvasTextRenderer.js');
-$scripts->addFile('jqplot/plugins/jqplot.canvasAxisLabelRenderer.js');
-$scripts->addFile('jqplot/plugins/jqplot.dateAxisRenderer.js');
-$scripts->addFile('jqplot/plugins/jqplot.highlighter.js');
-$scripts->addFile('jqplot/plugins/jqplot.cursor.js');
+$scripts->addFile('vendor/jqplot/jquery.jqplot.js');
+$scripts->addFile('vendor/jqplot/plugins/jqplot.pieRenderer.js');
+$scripts->addFile('vendor/jqplot/plugins/jqplot.enhancedPieLegendRenderer.js');
+$scripts->addFile('vendor/jqplot/plugins/jqplot.canvasTextRenderer.js');
+$scripts->addFile('vendor/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js');
+$scripts->addFile('vendor/jqplot/plugins/jqplot.dateAxisRenderer.js');
+$scripts->addFile('vendor/jqplot/plugins/jqplot.highlighter.js');
+$scripts->addFile('vendor/jqplot/plugins/jqplot.cursor.js');
 $scripts->addFile('jqplot/plugins/jqplot.byteFormatter.js');
 
 $scripts->addFile('server_status_monitor.js');
diff --git a/server_status_queries.php b/server_status_queries.php
index d4ffe073eb..bb06a4a587 100644
--- a/server_status_queries.php
+++ b/server_status_queries.php
@@ -25,10 +25,10 @@ $scripts  = $header->getScripts();
 
 // for charting
 $scripts->addFile('chart.js');
-$scripts->addFile('jqplot/jquery.jqplot.js');
-$scripts->addFile('jqplot/plugins/jqplot.pieRenderer.js');
-$scripts->addFile('jqplot/plugins/jqplot.highlighter.js');
-$scripts->addFile('jqplot/plugins/jqplot.enhancedPieLegendRenderer.js');
+$scripts->addFile('vendor/jqplot/jquery.jqplot.js');
+$scripts->addFile('vendor/jqplot/plugins/jqplot.pieRenderer.js');
+$scripts->addFile('vendor/jqplot/plugins/jqplot.highlighter.js');
+$scripts->addFile('vendor/jqplot/plugins/jqplot.enhancedPieLegendRenderer.js');
 $scripts->addFile('vendor/jquery/jquery.tablesorter.js');
 $scripts->addFile('server_status_sorter.js');
 $scripts->addFile('server_status_queries.js');