Merge pull request #645 from roramirez/grunt-config

Add config/* to the Grunt target.
This commit is contained in:
Michael Teeuw 2017-01-24 14:43:32 +01:00 committed by GitHub
commit 57ea2ac039
2 changed files with 27 additions and 26 deletions

View File

@ -9,6 +9,7 @@ module.exports = function(grunt) {
target: ["js/*.js", "modules/default/*.js", "modules/default/*/*.js", target: ["js/*.js", "modules/default/*.js", "modules/default/*/*.js",
"serveronly/*.js", "*.js", "tests/*/*.js", "!modules/default/alert/notificationFx.js", "serveronly/*.js", "*.js", "tests/*/*.js", "!modules/default/alert/notificationFx.js",
"!modules/default/alert/modernizr.custom.js", "!modules/default/alert/classie.js", "!modules/default/alert/modernizr.custom.js", "!modules/default/alert/classie.js",
"config/*",
] ]
}, },
stylelint: { stylelint: {

View File

@ -8,61 +8,61 @@ var config = {
port: 8080, port: 8080,
ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"], ipWhitelist: ["127.0.0.1", "::ffff:127.0.0.1", "::1"],
language: 'en', language: "en",
timeFormat: 24, timeFormat: 24,
units: 'metric', units: "metric",
modules: [ modules: [
{ {
module: 'alert', module: "alert",
}, },
{ {
module: "updatenotification", module: "updatenotification",
position: "top_bar" position: "top_bar"
}, },
{ {
module: 'clock', module: "clock",
position: 'top_left' position: "top_left"
}, },
{ {
module: 'calendar', module: "calendar",
header: 'US Holidays', header: "US Holidays",
position: 'top_left', position: "top_left",
config: { config: {
calendars: [ calendars: [
{ {
symbol: 'calendar-check-o ', symbol: "calendar-check-o ",
url: 'webcal://www.calendarlabs.com/templates/ical/US-Holidays.ics' url: "webcal://www.calendarlabs.com/templates/ical/US-Holidays.ics"
} }
] ]
} }
}, },
{ {
module: 'compliments', module: "compliments",
position: 'lower_third' position: "lower_third"
}, },
{ {
module: 'currentweather', module: "currentweather",
position: 'top_right', position: "top_right",
config: { config: {
location: 'New York', location: "New York",
locationID: '', //ID from http://www.openweathermap.org locationID: "", //ID from http://www.openweathermap.org
appid: 'YOUR_OPENWEATHER_API_KEY' appid: "YOUR_OPENWEATHER_API_KEY"
} }
}, },
{ {
module: 'weatherforecast', module: "weatherforecast",
position: 'top_right', position: "top_right",
header: 'Weather Forecast', header: "Weather Forecast",
config: { config: {
location: 'New York', location: "New York",
locationID: '5128581', //ID from http://www.openweathermap.org locationID: "5128581", //ID from http://www.openweathermap.org
appid: 'YOUR_OPENWEATHER_API_KEY' appid: "YOUR_OPENWEATHER_API_KEY"
} }
}, },
{ {
module: 'newsfeed', module: "newsfeed",
position: 'bottom_bar', position: "bottom_bar",
config: { config: {
feeds: [ feeds: [
{ {
@ -79,4 +79,4 @@ var config = {
}; };
/*************** DO NOT EDIT THE LINE BELOW ***************/ /*************** DO NOT EDIT THE LINE BELOW ***************/
if (typeof module !== 'undefined') {module.exports = config;} if (typeof module !== "undefined") {module.exports = config;}