Skip to content

Commit

Permalink
Little bit of code clean up, got jsoneditor to work
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert DeLuca committed Jan 25, 2015
1 parent 7c83c59 commit 40d9c1b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
3 changes: 3 additions & 0 deletions Brocfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ app.import('bower_components/jsoneditor/jsoneditor.js');
app.import('bower_components/jsoneditor/jsoneditor.css');
app.import('bower_components/ember-jsoneditor/build/lib.js');
app.import('bower_components/ember-jsoneditor/build/lib.css');
app.import('bower_components/jsoneditor/img/jsoneditor-icons.png', {
destDir: 'assets/img'
});

// Use `app.import` to add additional libraries to the generated
// output files.
Expand Down
5 changes: 0 additions & 5 deletions addon/components/c3-chart.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,6 @@ export default Ember.Component.extend({
}
}.property('element', '_config'),

/**
*/
_config: function() {
var self = this;
var c = self.getProperties([
Expand Down Expand Up @@ -162,5 +159,3 @@ export default Ember.Component.extend({
chart.load(self.get('data'));
}.observes('data').on('didInsertElement')
});

// Ember.Handlebars.helper('c3-chart', Ember.C3.ChartComponent);
2 changes: 1 addition & 1 deletion blueprints/ember-c3/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
description: '',
normalizeEntityName: function() {},

afterInstall: function() {
var self = this;
Expand Down
4 changes: 3 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
"qunit": "~1.17.1",
"c3": ">=0.1.43-0 < 1.0.0-0",
"d3": "~3.4.13",
"jsoneditor": "~2.3.6",
"ember-jsoneditor": "~0.1.0"
},
"devDependencies": {
"jsoneditor": "~3.1.2"
}
}

0 comments on commit 40d9c1b

Please sign in to comment.