js / css

firstandthird · May 7, 2018 · 028bb51 · 028bb51
1 parent 33687b3
commit 028bb51
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/index.js b/index.js
@@ -8,7 +8,7 @@ const register = (server, pluginOptions) => {
     const rows = table.slice(1).reduce((tableString, n) => `${tableString}<tr><td>${n.join('</td><td>')}</td></tr>${os.EOL}`, '');
     const css = options.css.map(link => `<link rel="stylesheet" type="text/css" href=${link}>"`).join(os.EOL);
     const scripts = options.scripts.map(link => `<script type="text/javascript" src="${link}"></script>`).join(os.EOL);
-    return `${css}${os.EOL}${scripts}${os.EOL}<table${tableAttributes}>${os.EOL}${header}${rows}</table>`;
+    return `${css}${css ? os.EOL : ''}${scripts}${scripts ? os.EOL : ''}<table${tableAttributes}>${os.EOL}${header}${rows}</table>`;
   };
 
   server.ext('onRequest', (request, h) => {

diff --git a/tests/output5.html b/tests/output5.html
@@ -1,5 +1,5 @@
-<link rel="stylesheet" type="text/css" href=css.js>"
-<link rel="stylesheet" type="text/css" href=css2.js>"
+<link rel="stylesheet" type="text/css" href=css.css>"
+<link rel="stylesheet" type="text/css" href=css2.css>"
 <script type="text/javascript" src="script.js"></script>
 <script type="text/javascript" src="script2.js"></script>
 <table>

diff --git a/tests/test.html.js b/tests/test.html.js
@@ -227,7 +227,7 @@ tap.test('be able to pass in css and js links', async(t) => {
     config: {
       plugins: {
         'hapi-transform-table': {
-          css: ['css.js', 'css2.js'],
+          css: ['css.css', 'css2.css'],
           scripts: ['script.js', 'script2.js'],
         }
       }