Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 47 additions & 15 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

var fs = require('fs');
var path = require('path');
var UglifyJS = require("uglify-js");
var UglifyJS = require('uglify-js');
var PACE_DIR = 'pace-progress';

var _paceConfig = {};
Expand Down Expand Up @@ -36,17 +36,18 @@ var _defaultPaceConfig = {
}
};


module.exports = {
name: 'ember-cli-pace',

config: function (environment, baseConfig) {
config: function(environment, baseConfig) {
if ('pace' in baseConfig) {
if (!baseConfig.pace) {
_paceConfig = false;
} else {
Object.keys(_defaultPaceConfig).forEach(function (key) {
_paceConfig[key] = baseConfig.pace.hasOwnProperty(key) ? baseConfig.pace[key] : _defaultPaceConfig[key];
Object.keys(_defaultPaceConfig).forEach(function(key) {
_paceConfig[key] = baseConfig.pace.hasOwnProperty(key)
? baseConfig.pace[key]
: _defaultPaceConfig[key];
});
}
} else {
Expand All @@ -67,11 +68,24 @@ module.exports = {
};
},

treeFor: function (name) {
treeFor: function(name) {
if (_paceConfig && name === 'styles') {
var paceThemeName = path.join(_paceConfig.color, 'pace-theme-' + _paceConfig.theme + '.css'),
originalPaceThemePath = path.join('node_modules', PACE_DIR, 'themes', paceThemeName),
addonPaceThemePath = path.join('vendor', 'ember-cli-pace', 'themes', paceThemeName);
var paceThemeName = path.join(
_paceConfig.color,
'pace-theme-' + _paceConfig.theme + '.css'
),
originalPaceThemePath = path.join(
'node_modules',
PACE_DIR,
'themes',
paceThemeName
),
addonPaceThemePath = path.join(
'vendor',
'ember-cli-pace',
'themes',
paceThemeName
);

if (fs.existsSync(originalPaceThemePath)) {
this.app.import(originalPaceThemePath);
Expand All @@ -83,21 +97,39 @@ module.exports = {
}
},

contentFor: function (name) {
contentFor: function(name) {
if (_paceConfig && name === 'head') {
var paceScriptPath = path.join('node_modules', PACE_DIR, 'pace.js'),
addonScriptPath = path.resolve(__dirname, 'vendor', 'ember-cli-pace', 'script-loader.js'),
paceScript, addonScript;
addonScriptPath = path.resolve(
__dirname,
'vendor',
'ember-cli-pace',
'script-loader.js'
),
paceScript,
addonScript;

if (this.app.env === 'production') {
paceScript = UglifyJS.minify(paceScriptPath).code;
addonScript = UglifyJS.minify(addonScriptPath).code;
paceScript = UglifyJS.minify(fs.readFileSync(paceScriptPath, 'utf8'))
.code;
addonScript = UglifyJS.minify(fs.readFileSync(addonScriptPath, 'utf8'))
.code;
// paceScript = UglifyJS.minify(paceScriptPath).code;
// addonScript = UglifyJS.minify(addonScriptPath).code;
} else {
paceScript = fs.readFileSync(paceScriptPath, 'utf8');
addonScript = fs.readFileSync(addonScriptPath, 'utf8');
}

return '<script type="text/javascript" data-pace-options=\'' + JSON.stringify(_paceConfig) + '\'>' + paceScript + ';\n' + addonScript + '</script>';
return (
'<script type="text/javascript" data-pace-options=\'' +
JSON.stringify(_paceConfig) +
"'>" +
paceScript +
';\n' +
addonScript +
'</script>'
);
}
}
};
24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"name": "ember-cli-pace-gs",
"version": "1.1.6",
"description": "Pace.js load progress bar for Ember apps.",
"name": "ember-cli-pace-alyne",
"version": "1.1.9",
"description": "Pace.js load progress bar for Ember apps (built by praya)",
"keywords": [
"ember-addon"
],
"license": "MIT",
"author": "praya",
"author": "",
"directories": {
"doc": "doc",
"test": "tests"
},
"repository": "https://github.com/praya/ember-cli-pace-gs",
"repository": "https://github.com/alyne/ember-cli-pace-gs",
"scripts": {
"build": "ember build",
"lint:js": "eslint ./*.js addon addon-test-support app config lib server test-support tests",
Expand All @@ -26,24 +26,24 @@
"devDependencies": {
"broccoli-asset-rev": "^2.4.5",
"ember-ajax": "^3.0.0",
"ember-cli": "~2.18.2",
"ember-cli": "3.1.3",
"ember-cli-dependency-checker": "^2.0.0",
"ember-cli-eslint": "^4.2.1",
"ember-cli-htmlbars": "^2.0.1",
"ember-cli-htmlbars-inline-precompile": "^1.0.0",
"ember-cli-inject-live-reload": "^1.4.1",
"ember-cli-qunit": "^4.1.1",
"ember-cli-inject-live-reload": "^1.6.1",
"ember-cli-qunit": "^4.3.2",
"ember-cli-shims": "^1.2.0",
"ember-cli-sri": "^2.1.0",
"ember-cli-uglify": "^2.0.0",
"ember-disable-prototype-extensions": "^1.1.2",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^1.0.0",
"ember-resolver": "^4.0.0",
"ember-source": "~2.18.0",
"ember-load-initializers": "^1.1.0",
"ember-resolver": "^4.1.0",
"ember-source": "3.1.4",
"eslint-plugin-ember": "^5.0.0",
"eslint-plugin-node": "^5.2.1",
"loader.js": "^4.2.3"
"loader.js": "^4.5.1"
},
"engines": {
"node": "^4.5 || 6.* || >= 7.*"
Expand Down
Loading