summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Metson <simonmetson+github@googlemail.com>2013-03-12 11:19:04 +0000
committerSimon Metson <simonmetson+github@googlemail.com>2013-03-12 11:19:04 +0000
commite6dbe7a1cdb70378f17e782f26ea5a2ca5a88761 (patch)
tree67c8ab175e5c4e15e726ea01ba222554cdfa2a82
parent73350051f9794f6428a4b36ce7be1c0561ebbad7 (diff)
downloadcouchdb-e6dbe7a1cdb70378f17e782f26ea5a2ca5a88761.tar.gz
Correct default template
Spotted during review with Mike W.
-rw-r--r--src/fauxton/grunt.js18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/fauxton/grunt.js b/src/fauxton/grunt.js
index 0e9ee5d0e..bcf2eeadf 100644
--- a/src/fauxton/grunt.js
+++ b/src/fauxton/grunt.js
@@ -70,18 +70,16 @@ module.exports = function(grunt) {
var templateSettings = function(){
var defaultSettings = {
- "template": {
- "src": "assets/index.underscore",
- "dest": "dist/debug/index.html",
- "variables": {
- "assets_root": "./",
- "requirejs": "require.js",
- "base": null
- }
+ "src": "assets/index.underscore",
+ "dest": "dist/debug/index.html",
+ "variables": {
+ "assets_root": "./",
+ "requirejs": "require.js",
+ "base": null
}
};
- var settings = grunt.file.readJSON("settings.json") || defaultSettings;
- return {template: settings.template};
+ var settings = grunt.file.readJSON("settings.json");
+ return {template: settings.template || defaultSettings};
}();
grunt.initConfig({