Skip to content
This repository was archived by the owner on Nov 11, 2024. It is now read-only.

Commit 1b2cefb

Browse files
committed
Update to highcharts 4
* Use assets from Highcharts' CDN (http://code.highcharts.com/) * Remove bundled assets * Update Readme * Bump minor version
1 parent 3d0879f commit 1b2cefb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+11
-63457
lines changed

README.md

+10-13
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ DRY out your chart code by writing it all in PHP!
2727

2828

2929
## License
30+
3031
ObHighchartsBundle is released under the MIT License. See the bundled [LICENSE](LICENSE)
3132
file for details.
3233

@@ -44,7 +45,7 @@ for details on pricing.
4445
```json
4546
"require": {
4647
...
47-
"ob/highcharts-bundle": "1.*"
48+
"ob/highcharts-bundle": "1.1.*"
4849
...
4950
}
5051
```
@@ -65,12 +66,7 @@ for details on pricing.
6566
);
6667
...
6768
```
68-
69-
4. Install the static assets
7069

71-
```bash
72-
php app/console assets:install --symlink web
73-
```
7470

7571
## Usage
7672

@@ -80,6 +76,7 @@ In your controller ...
8076

8177
``` php
8278
<?php
79+
8380
use Ob\HighchartsBundle\Highcharts\Highchart;
8481

8582
// ...
@@ -109,8 +106,8 @@ In your template ...
109106
<!-- Load jQuery from Google's CDN if needed -->
110107
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script>
111108

112-
<script src="{{ asset('bundles/obhighcharts/js/highcharts/highcharts.js') }}"></script>
113-
<script src="{{ asset('bundles/obhighcharts/js/highcharts/modules/exporting.js') }}"></script>
109+
<script src="//cdnjs.cloudflare.com/ajax/libs/highcharts/4.0.1/highcharts.js"></script>
110+
<script src="//cdnjs.cloudflare.com/ajax/libs/highcharts/4.0.1/modules/exporting.js"></script>
114111
<script type="text/javascript">
115112
{{ chart(chart) }}
116113
</script>
@@ -128,10 +125,10 @@ argument of the twig extension like this
128125
``` html
129126
<!-- Load MooTools from Google's CDN if needed and the highcharts adapter -->
130127
<script src="https://ajax.googleapis.com/ajax/libs/mootools/1.4.2/mootools-yui-compressed.js" type="text/javascript"></script>
131-
<script src="{{ asset('bundles/obhighcharts/js/highcharts/adapters/mootools-adapter.js') }}" type="text/javascript"></script>
128+
<script src="//code.highcharts.com/4.0.1/adapters/mootools-adapter.js" type="text/javascript"></script>
132129

133-
<script src="{{ asset('bundles/obhighcharts/js/highcharts/highcharts.js') }}"></script>
134-
<script src="{{ asset('bundles/obhighcharts/js/highcharts/modules/exporting.js') }}"></script>
130+
<script src="//cdnjs.cloudflare.com/ajax/libs/highcharts/4.0.1/highcharts.js"></script>
131+
<script src="//cdnjs.cloudflare.com/ajax/libs/highcharts/4.0.1/modules/exporting.js"></script>
135132
<script type="text/javascript">
136133
{{ chart(chart, 'mootools') }}
137134
</script>
@@ -144,8 +141,8 @@ It is also possible to render your highcharts code without a jquery or mootools
144141
control how and when the chart is loaded or when integrating with existing code.
145142

146143
``` html
147-
<script src="{{ asset('bundles/obhighcharts/js/highcharts/highcharts.js') }}"></script>
148-
<script src="{{ asset('bundles/obhighcharts/js/highcharts/modules/exporting.js') }}"></script>
144+
<script src="//cdnjs.cloudflare.com/ajax/libs/highcharts/4.0.1/highcharts.js"></script>
145+
<script src="//cdnjs.cloudflare.com/ajax/libs/highcharts/4.0.1/modules/exporting.js"></script>
149146
<script type="text/javascript">
150147
myLib.chartLoad(function(data){
151148
{{ chart(chart, false) }}

Resources/public/js/highcharts/adapters/mootools-adapter.js

-13
This file was deleted.

0 commit comments

Comments
 (0)