suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add ability to extend config by setting it in index.html

Browse Source
This commit is contained in:
Piotr Sarnacki 2015-02-03 10:52:50 +01:00
parent 579388e08d
commit 65e0789250
2 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/index.html
View File

@ -13,6 +13,10 @@
<link rel="stylesheet" href="assets/travis.css">
{{content-for 'head-footer'}}
<script>
window.TravisENV = {};
</script>
</head>
<body>
{{content-for 'body'}}

37
config/environment.js
View File

@ -1,5 +1,28 @@
/* 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) {
var ENV = {
modulePrefix: 'travis',
@ -31,6 +54,11 @@ module.exports = function(environment) {
intervals: { updateTimes: 1000 }
};
// merge environment vars from index.html
if(typeof TravisENV !== 'undefined') {
extend(ENV, TravisENV);
}
if (environment === 'development') {
// ENV.APP.LOG_RESOLVER = true;
// ENV.APP.LOG_ACTIVE_GENERATION = true;
@ -55,15 +83,6 @@ module.exports = function(environment) {
}
ENV.endpoints = {
ssh_key: false,
caches: false
};
ENV.pro = false;
ENV.pusher = {};
ENV.intervals = { updateTimes: 1000, times: -1 };
ENV.api_endpoint = 'https://api.travis-ci.org';
ENV.contentSecurityPolicy = {
'default-src': "'none'",
// TODO: for some reason unsafe-eval is needed when I use collection helper,