diff options
| author | Fabian Becker <halfdan@xnorfz.de> | 2013-04-14 05:08:11 +0400 |
|---|---|---|
| committer | Fabian Becker <halfdan@xnorfz.de> | 2013-04-14 05:08:11 +0400 |
| commit | 2a3547bd5e15594838c7fbf3b9131c629ff6e799 (patch) | |
| tree | 9a5cef37e8ef67162fd27e296214ab4b75754cc5 /libs | |
| parent | 38c10367f6aec99a44faa72ac0f4bff5e1c307e0 (diff) | |
| parent | 8343de57a75638184183033c46be61d4469c8efc (diff) | |
Merge branch 'master' into 2.x-twig
Conflicts:
plugins/Overlay/templates/index.tpl
Diffstat (limited to 'libs')
| -rwxr-xr-x | libs/jqplot/build_minified_script.sh | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/libs/jqplot/build_minified_script.sh b/libs/jqplot/build_minified_script.sh index 5a0efd25df..38584f136d 100755 --- a/libs/jqplot/build_minified_script.sh +++ b/libs/jqplot/build_minified_script.sh @@ -1,7 +1,25 @@ # build jqplot-custom.min.js # the yuicompressor needs to be set up in piwik/js (see piwik/js/README.md) -find . -name 'jqplot.*.js' -print|xargs cat > jqplot-custom.min.js-temp +cat jqplot.core.js > jqplot-custom.min.js-temp +cat jqplot.linearAxisRenderer.js >> jqplot-custom.min.js-temp +cat jqplot.axisTickRenderer.js >> jqplot-custom.min.js-temp +cat jqplot.axisLabelRenderer.js >> jqplot-custom.min.js-temp +cat jqplot.tableLegendRenderer.js >> jqplot-custom.min.js-temp +cat jqplot.lineRenderer.js >> jqplot-custom.min.js-temp +cat jqplot.linePattern.js >> jqplot-custom.min.js-temp +cat jqplot.markerRenderer.js >> jqplot-custom.min.js-temp +cat jqplot.divTitleRenderer.js >> jqplot-custom.min.js-temp +cat jqplot.canvasGridRenderer.js >> jqplot-custom.min.js-temp +cat jqplot.shadowRenderer.js >> jqplot-custom.min.js-temp +cat jqplot.shapeRenderer.js >> jqplot-custom.min.js-temp +cat jqplot.sprintf.js >> jqplot-custom.min.js-temp +cat jqplot.themeEngine.js >> jqplot-custom.min.js-temp +cat plugins/jqplot.pieRenderer.js >> jqplot-custom.min.js-temp +cat plugins/jqplot.barRenderer.js >> jqplot-custom.min.js-temp +cat plugins/jqplot.categoryAxisRenderer.js >> jqplot-custom.min.js-temp +cat plugins/jqplot.canvasTextRenderer.js >> jqplot-custom.min.js-temp +cat plugins/jqplot.canvasAxisTickRenderer.js >> jqplot-custom.min.js-temp java -jar ../../js/yuicompressor-2.4.2/build/yuicompressor-2.4.2.jar --type js --line-break 1000 jqplot-custom.min.js-temp > jqplot-custom.min.js |