From 6d623545cb750d5c59b5bac7cf721111a5bbbf66 Mon Sep 17 00:00:00 2001 From: Zachary Skalko Date: Fri, 14 Jul 2017 10:21:54 -0500 Subject: [PATCH 1/5] add respect for extension property in options file --- index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/index.js b/index.js index 84cbe42..71b3ea1 100644 --- a/index.js +++ b/index.js @@ -110,6 +110,7 @@ function parseObj (input) { ['pretty', 'pretty'], // --pretty ['basedir', 'basedir'], // --basedir ['doctype', 'doctype'], // --doctype + ['extension', 'extension'],// --extension ].forEach(function (o) { options[o[1]] = program[o[0]] !== undefined ? program[o[0]] : options[o[1]]; }); @@ -266,6 +267,7 @@ function renderFile(path, rootPath) { // --extension var extname; if (program.extension) extname = '.' + program.extension; + else if (options.extension) extname = '.' + options.extension; else if (options.client) extname = '.js'; else if (program.extension === '') extname = ''; else extname = '.html'; From 06833d3a5f55c326bc22665f727324d655c37759 Mon Sep 17 00:00:00 2001 From: Zachary Skalko Date: Fri, 14 Jul 2017 15:00:24 -0500 Subject: [PATCH 2/5] Update .travis.yml --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7c816d2..dc8a01a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,3 +15,8 @@ after_success: notifications: email: on_success: never + +branches: + only: + - master + - test From 0d92a2b449f6f2c3c33497062a42c96ed43e7131 Mon Sep 17 00:00:00 2001 From: Zachary Skalko Date: Fri, 14 Jul 2017 15:18:55 -0500 Subject: [PATCH 3/5] Revert "add respect for extension property in options file" This reverts commit 6d623545cb750d5c59b5bac7cf721111a5bbbf66. --- index.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/index.js b/index.js index 71b3ea1..84cbe42 100644 --- a/index.js +++ b/index.js @@ -110,7 +110,6 @@ function parseObj (input) { ['pretty', 'pretty'], // --pretty ['basedir', 'basedir'], // --basedir ['doctype', 'doctype'], // --doctype - ['extension', 'extension'],// --extension ].forEach(function (o) { options[o[1]] = program[o[0]] !== undefined ? program[o[0]] : options[o[1]]; }); @@ -267,7 +266,6 @@ function renderFile(path, rootPath) { // --extension var extname; if (program.extension) extname = '.' + program.extension; - else if (options.extension) extname = '.' + options.extension; else if (options.client) extname = '.js'; else if (program.extension === '') extname = ''; else extname = '.html'; From ac640c7417c6335bd1943308c2636cd750fe414e Mon Sep 17 00:00:00 2001 From: Zachary Skalko Date: Fri, 14 Jul 2017 15:20:39 -0500 Subject: [PATCH 4/5] Revert "Update .travis.yml" This reverts commit 06833d3a5f55c326bc22665f727324d655c37759. --- .travis.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index dc8a01a..7c816d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,3 @@ after_success: notifications: email: on_success: never - -branches: - only: - - master - - test From 474359f77e7217bc7ed1bcdc9422a03017b1c804 Mon Sep 17 00:00:00 2001 From: Zachary Skalko Date: Fri, 14 Jul 2017 15:22:33 -0500 Subject: [PATCH 5/5] Revert "Revert "add respect for extension property in options file"" This reverts commit 0d92a2b449f6f2c3c33497062a42c96ed43e7131. --- index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/index.js b/index.js index 84cbe42..71b3ea1 100644 --- a/index.js +++ b/index.js @@ -110,6 +110,7 @@ function parseObj (input) { ['pretty', 'pretty'], // --pretty ['basedir', 'basedir'], // --basedir ['doctype', 'doctype'], // --doctype + ['extension', 'extension'],// --extension ].forEach(function (o) { options[o[1]] = program[o[0]] !== undefined ? program[o[0]] : options[o[1]]; }); @@ -266,6 +267,7 @@ function renderFile(path, rootPath) { // --extension var extname; if (program.extension) extname = '.' + program.extension; + else if (options.extension) extname = '.' + options.extension; else if (options.client) extname = '.js'; else if (program.extension === '') extname = ''; else extname = '.html';