Skip to content

Commit

Permalink
Updated tests. Added Highstock demo to the dummy app.
Browse files Browse the repository at this point in the history
  • Loading branch information
lolmaus committed Mar 5, 2015
1 parent 38e06eb commit d18b079
Show file tree
Hide file tree
Showing 9 changed files with 1,913 additions and 4 deletions.
1 change: 1 addition & 0 deletions Brocfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@ var app = new EmberAddon();
// modules that you would like to import into your application
// please specify an object with the list of modules as keys
// along with the exports of each module as its value.
app.import('bower_components/highstock-release/highstock.src.js');

module.exports = app.toTree();
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,8 @@ This add-on is built based on the [gist](https://gist.github.com/poteto/cd2bb47e

- Added an ability to use Highstock and Highmaps.
- The addon no longer automatically imports the Highcharts Bower package, letting user import desired package manually.

### 0.0.6

- Updated tests.
- Added Highstock demo to the dummy app.
3 changes: 1 addition & 2 deletions addon/components/high-charts.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ export default Ember.Component.extend({
mode = this.get('mode');
if ( typeof mode === 'string' && !!mode) {
options.unshift(mode);
};
Ember.Logger.debug('mode', mode);
}
$element = this.$();
chart = $element.highcharts.apply($element, options).highcharts();
this.set('chart', chart);
Expand Down
3 changes: 2 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"ember-load-initializers": "ember-cli/ember-load-initializers#0.0.2",
"ember-qunit": "0.1.8",
"ember-qunit-notifications": "0.0.5",
"qunit": "~1.17.1"
"qunit": "~1.17.1",
"highstock-release": "~2.1.3"
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-highcharts",
"version": "0.0.5",
"version": "0.0.6",
"description": "A Highcharts component for ember cli",
"directories": {
"doc": "doc",
Expand Down
15 changes: 15 additions & 0 deletions tests/dummy/app/controllers/application.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import Ember from 'ember';
import stockData from '../data/stock';

export default Ember.Controller.extend({
chartOptions: {
Expand All @@ -23,5 +24,19 @@ export default Ember.Controller.extend({
}, {
name: 'John',
data: [5, 7, 3]
}],

stockChartOptions: {
rangeSelector: {
selected: 1
},
title: {
text: 'Highstock: AAPL Stock Price'
}
},

stockChartData: [{
name: 'AAPL',
data: stockData
}]
});
Loading

0 comments on commit d18b079

Please sign in to comment.