moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/janeklb/moodle

Browse source
This commit is contained in:
Andrew Nicols 2016-01-12 15:57:36 +08:00 • committed by Dan Poltawski
commit dc8675fdad
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Gruntfile.js
View file

@ -26,13 +26,14 @@ module.exports = function(grunt) {
var path = require('path'), var path = require('path'),
fs = require('fs'), fs = require('fs'),
tasks = {}, tasks = {},
cwd = process.env.PWD || process.cwd(); cwd = process.env.PWD || process.cwd(),
inAMD = path.basename(cwd) == 'amd';
// Project configuration. // Project configuration.
grunt.initConfig({ grunt.initConfig({
jshint: { jshint: {
options: {jshintrc: '.jshintrc'}, options: {jshintrc: '.jshintrc'},
files: ['**/amd/src/*.js'] files: [inAMD ? cwd + '/src/*.js' : '**/amd/src/*.js']
}, },
uglify: { uglify: {
dynamic_mappings: { dynamic_mappings: {
@ -222,7 +223,7 @@ module.exports = function(grunt) {
if (path.basename(path.resolve(cwd, '../../')) == 'yui') { if (path.basename(path.resolve(cwd, '../../')) == 'yui') {
grunt.task.run('shifter'); grunt.task.run('shifter');
// Are we in an AMD directory? // Are we in an AMD directory?
} else if (path.basename(cwd) == 'amd') { } else if (inAMD) {
grunt.task.run('amd'); grunt.task.run('amd');
} else { } else {
// Run them all!. // Run them all!.