Permalink
Browse files

Minor cleanup. (#818)

  • Loading branch information...
1 parent 7375c5d commit b75b688e815c2f1326d506f40ac4e9af254be732 @XhmikosR XhmikosR committed with jmervine Dec 16, 2016
Showing with 8 additions and 8 deletions.
  1. +3 −2 lib/helpers.js
  2. +4 −4 scripts/integrity.js
  3. +1 −2 tests/functional_test.js
View
@@ -16,7 +16,7 @@ function sriDigest(file, fromString) {
}
function selectedTheme(config, selected) {
- if (typeof selected === 'undefined' || selected === 'undefined') {
+ if (typeof selected === 'undefined') {
return config.theme;
}
@@ -25,9 +25,10 @@ function selectedTheme(config, selected) {
}
function getTheme(config, selected) {
- selected = selectedTheme(config, selected);
var themes = config.bootswatch.themes;
+ selected = selectedTheme(config, selected);
+
return {
uri: config.bootswatch.bootstrap
.replace('SWATCH_VERSION', config.bootswatch.version)
@@ -2,11 +2,11 @@
'use strict';
-var fs = require('fs');
-var path = require('path');
-var yaml = require('js-yaml');
+var fs = require('fs');
+var path = require('path');
+var yaml = require('js-yaml');
-var sri = require(path.join(__dirname, 'sri'));
+var sri = require(path.join(__dirname, 'sri'));
var basedir = path.join(__dirname, '..');
var configFile = path.join(basedir, 'config', '_config.yml');
@@ -31,14 +31,13 @@ var expectedHeaders = {
'last-modified': undefined,
'x-cache': undefined,
- // 'x-amz-server-side-encryption': 'AES256',
'accept-ranges': undefined,
'access-control-allow-origin': '*',
// the following are set as undefined because www
// and assets (js/css) differ
'server': undefined,
- 'x-hello-human': undefined, // because www and assets differ
+ 'x-hello-human': undefined,
'cache-control': undefined
};

0 comments on commit b75b688

Please sign in to comment.