Remove unused code from environment.js
We can't get anything from window in config/environment.js, because it's run at compile time, not at run time.
This commit is contained in:
parent
426e67e7b4
commit
86b0e3a765
|
@ -1,28 +1,5 @@
|
||||||
/* jshint node: true */
|
/* jshint node: true */
|
||||||
|
|
||||||
// TODO: how to include this from app/utils/ here?
|
|
||||||
var extend = function(out) {
|
|
||||||
out = out || {};
|
|
||||||
|
|
||||||
for (var i = 1; i < arguments.length; i++) {
|
|
||||||
var obj = arguments[i];
|
|
||||||
|
|
||||||
if (!obj)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
for (var key in obj) {
|
|
||||||
if (obj.hasOwnProperty(key)) {
|
|
||||||
if (typeof obj[key] === 'object')
|
|
||||||
deepExtend(out[key], obj[key]);
|
|
||||||
else
|
|
||||||
out[key] = obj[key];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return out;
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports = function(environment) {
|
module.exports = function(environment) {
|
||||||
var ENV = {
|
var ENV = {
|
||||||
modulePrefix: 'travis',
|
modulePrefix: 'travis',
|
||||||
|
@ -54,11 +31,6 @@ module.exports = function(environment) {
|
||||||
intervals: { updateTimes: 1000 }
|
intervals: { updateTimes: 1000 }
|
||||||
};
|
};
|
||||||
|
|
||||||
// merge environment vars from index.html
|
|
||||||
if(typeof TravisENV !== 'undefined') {
|
|
||||||
extend(ENV, TravisENV);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (environment === 'development') {
|
if (environment === 'development') {
|
||||||
// ENV.APP.LOG_RESOLVER = true;
|
// ENV.APP.LOG_RESOLVER = true;
|
||||||
// ENV.APP.LOG_ACTIVE_GENERATION = true;
|
// ENV.APP.LOG_ACTIVE_GENERATION = true;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user