diff --git a/Gruntfile.js.sample b/Gruntfile.js.sample index ec0cd43ec3c7302b0b7874d1d29fbf3d948bd00e..1e9c191ba1115a4338fb80182cdca0836e242ef1 100644 --- a/Gruntfile.js.sample +++ b/Gruntfile.js.sample @@ -11,7 +11,7 @@ module.exports = function (grunt) { var _ = require('underscore'), path = require('path'), - themes = require('./dev/tools/grunt/tools/files-router').getThemes(), + themes = require('./dev/tools/grunt/tools/files-router').get('themes'), configDir = './dev/tools/grunt/configs', tasks = grunt.file.expand('./dev/tools/grunt/tasks/*'); diff --git a/dev/tools/grunt/configs/clean.js b/dev/tools/grunt/configs/clean.js index d984620feb64742c984a6ac60a6b66a31b3cdc1e..53bcd8a1d830ebda056e59c6ba592106abcdde72 100644 --- a/dev/tools/grunt/configs/clean.js +++ b/dev/tools/grunt/configs/clean.js @@ -5,7 +5,7 @@ 'use strict'; -var themes = require('../tools/files-router').getThemes(), +var themes = require('../tools/files-router').get('themes'), _ = require('underscore'); var themeOptions = {}; diff --git a/dev/tools/grunt/configs/combo.js b/dev/tools/grunt/configs/combo.js index 7dca3a268db2762cd730d0e0b6974feb95e424d7..6dcbe7e36a667699bb830387aaea27e7932525f3 100644 --- a/dev/tools/grunt/configs/combo.js +++ b/dev/tools/grunt/configs/combo.js @@ -5,7 +5,7 @@ 'use strict'; -var theme = require('../tools/files-router').getThemes(), +var theme = require('../tools/files-router').get('themes'), path = require('./path'); /** diff --git a/dev/tools/grunt/configs/exec.js b/dev/tools/grunt/configs/exec.js index ee06b371347829e77083726ed3825b58c449e4ae..3e675ff9b5d81328e94b6e906495c67d43a90597 100644 --- a/dev/tools/grunt/configs/exec.js +++ b/dev/tools/grunt/configs/exec.js @@ -6,7 +6,7 @@ 'use strict'; var combo = require('./combo'), - themes = require('../tools/files-router').getThemes(), + themes = require('../tools/files-router').get('themes'), _ = require('underscore'); var themeOptions = {}; diff --git a/dev/tools/grunt/configs/less.js b/dev/tools/grunt/configs/less.js index 6f3b0f7ae6d99f73140f08251a3d89cc077887cb..7a849577127408fbddeeef91c0d97fa452377fc8 100644 --- a/dev/tools/grunt/configs/less.js +++ b/dev/tools/grunt/configs/less.js @@ -6,7 +6,7 @@ 'use strict'; var combo = require('./combo'), - themes = require('../tools/files-router').getThemes(), + themes = require('../tools/files-router').get('themes'), _ = require('underscore'); var themeOptions = {}; diff --git a/dev/tools/grunt/configs/watch.js b/dev/tools/grunt/configs/watch.js index 880b7f7e392dd1fa3fc11cf9e1ee289fac29e89f..84657ae7c4d8073ea9a0e8db3b58285c9b1f26cc 100644 --- a/dev/tools/grunt/configs/watch.js +++ b/dev/tools/grunt/configs/watch.js @@ -6,7 +6,7 @@ 'use strict'; var combo = require('./combo'), - themes = require('../tools/files-router').getThemes(), + themes = require('../tools/files-router').get('themes'), _ = require('underscore'); var themeOptions = {}; diff --git a/dev/tools/grunt/tools/files-router.js b/dev/tools/grunt/tools/files-router.js index dad794004ec26dcbcd0b6a38c73a207fb9b71afd..c120af31df626a80fb44c034e5ed6466b600d520 100644 --- a/dev/tools/grunt/tools/files-router.js +++ b/dev/tools/grunt/tools/files-router.js @@ -23,7 +23,7 @@ module.exports = { })(), /** - * Loads "themes" file. + * Loads file. * Load priority: * From user config; * From default config with ".loc" suffix ; @@ -31,15 +31,15 @@ module.exports = { * * @returns themes file or error */ - getThemes: function () { - if (this.userConfig && this.userConfig.themes) { - return require(this.getFullPath(this.userConfig.themes)); + get: function (file) { + if (this.userConfig && this.userConfig[file]) { + return require(this.getFullPath(this.userConfig[file])); } else { try { - return require(this.getFullPath(this.defaultConfig.themes + '.loc')); + return require(this.getFullPath(this.defaultConfig[file] + '.loc')); } catch (error) { try { - return require(this.getFullPath(this.defaultConfig.themes)); + return require(this.getFullPath(this.defaultConfig[file])); } catch (error) { throw error; }