From 30685afc194c7651d8b3e37d726fdfaadc90069e Mon Sep 17 00:00:00 2001 From: Adrien Antoine Date: Wed, 6 Mar 2013 17:09:18 +0000 Subject: [PATCH] Replaced amdWrapper by amd --- AUTHORS | 3 ++- Gruntfile.js | 6 +++--- tasks/jst.js | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/AUTHORS b/AUTHORS index 3114bd4..e61c92d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,4 +1,5 @@ Tim Branyen (http://tbranyen.com) Tyler Kellen (http://goingslowly.com/) Chris Talkington (http://christalkington.com/) -Larry Davis (http://lazd.net/) \ No newline at end of file +Larry Davis (http://lazd.net/) +Adrien Antoine (http://adriantoine.com/) \ No newline at end of file diff --git a/Gruntfile.js b/Gruntfile.js index 2a6e8d5..e11d65c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -46,7 +46,7 @@ module.exports = function(grunt) { variable: 'obj' }, prettify: true, - amdWrapper: true + amd: true }, files: { "tmp/pretty_amd.js": ["test/fixtures/template.html"] @@ -68,7 +68,7 @@ module.exports = function(grunt) { templateSettings: { variable: 'obj' }, - amdWrapper:true + amd:true }, files: { "tmp/amd_wrapper.js": ["test/fixtures/template.html"] @@ -79,7 +79,7 @@ module.exports = function(grunt) { templateSettings: { variable: 'obj' }, - amdWrapper:true, + amd:true, namespace:false }, files: { diff --git a/tasks/jst.js b/tasks/jst.js index 5a73a25..d1d6517 100644 --- a/tasks/jst.js +++ b/tasks/jst.js @@ -61,7 +61,7 @@ module.exports = function(grunt) { } filename = processName(filepath); - if (options.amdWrapper && options.namespace === false) { + if (options.amd && options.namespace === false) { return 'return ' + compiled; } return nsInfo.namespace+'['+JSON.stringify(filename)+'] = '+compiled+';'; @@ -73,7 +73,7 @@ module.exports = function(grunt) { if (options.namespace !== false) { output.unshift(nsInfo.declaration); } - if (options.amdWrapper) { + if (options.amd) { if (options.prettify) { output.forEach(function(line, index) { output[index] = " " + line;