Move jqPlot to js/vendor

Move js/jqplot to js/vendor/jqplot

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>

.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

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'

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');
     }
 

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'
             )
         );
 

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',

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');

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');