kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-21 12:55:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #784 from roramirez/validate_vendor_js_file

Browse Source 
Fix eslintignore for vendor/vendor.js and fix the eslint validation
This commit is contained in:
Michael Teeuw
2017-03-18 21:49:46 +01:00
committed by GitHub
parent 61935942cf f2ea701d34
commit e8f592c6e0
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.eslintignore
View File

@@ -1,6 +1,6 @@
vendor/ vendor/*
!/vendor/vendor.js !/vendor/vendor.js
!/modules/default/** !/modules/default/**
!/modules/node_helper !/modules/node_helper
!/modules/node_helper/** !/modules/node_helper/**
!/modules/default/defaultmodules.js !/modules/default/defaultmodules.js

2
Gruntfile.js
View File

@@ -10,7 +10,7 @@ module.exports = function(grunt) {
"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/*", "config/*",
"translations/translations.js" "translations/translations.js", "vendor/vendor.js"
] ]
}, },

10
vendor/vendor.js vendored
View File

@@ -8,9 +8,9 @@
*/ */
var vendor = { var vendor = {
'moment.js' : 'node_modules/moment/min/moment-with-locales.js', "moment.js" : "node_modules/moment/min/moment-with-locales.js",
'moment-timezone.js' : 'node_modules/moment-timezone/moment-timezone.js', "moment-timezone.js" : "node_modules/moment-timezone/moment-timezone.js",
'weather-icons.css': 'node_modules/weathericons/css/weather-icons.css', "weather-icons.css": "node_modules/weathericons/css/weather-icons.css",
'weather-icons-wind.css': 'node_modules/weathericons/css/weather-icons-wind.css', "weather-icons-wind.css": "node_modules/weathericons/css/weather-icons-wind.css",
'font-awesome.css': 'node_modules/font-awesome/css/font-awesome.min.css' "font-awesome.css": "node_modules/font-awesome/css/font-awesome.min.css"
}; };