Skip to content

Commit

Permalink
Fixes #1
Browse files Browse the repository at this point in the history
  • Loading branch information
dyatko committed Apr 7, 2015
1 parent dfc98be commit 3438991
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
9 changes: 7 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
var fs = require('fs');
var path = require('path');

var _pacePath;
var _paceConfig = {
var _pacePath, _paceConfig;
var _defaultPaceConfig = {
color: 'blue',
theme: 'minimal'
};
Expand All @@ -16,8 +16,13 @@ module.exports = {
config: function (environment, baseConfig) {
if ('pace' in baseConfig) {
_paceConfig = baseConfig.pace;
} else {
_paceConfig = {};
}

_paceConfig.color = _paceConfig.color || _defaultPaceConfig.color;
_paceConfig.theme = _paceConfig.theme || _defaultPaceConfig.theme;

if (environment === 'development') {
return {
pace: _paceConfig,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ember-cli-pace",
"version": "0.0.6",
"version": "0.0.7",
"description": "Pace.js load progress bar for Ember apps, incl. Flash-like initial script loading",
"directories": {
"doc": "doc",
Expand Down

0 comments on commit 3438991

Please sign in to comment.