Merge branch 'master' of https://github.com/node-red/node-red-nodegen

Dave Conway-Jones · Dave Conway-Jones · commit c4b1df3cf5a7 · 2019-12-23T15:11:07.000Z
diff --git a/templates/function/icons/icon.png b/templates/function/icons/icon.png
diff --git a/templates/function/icons/icon.svg b/templates/function/icons/icon.svg
@@ -0,0 +1 @@
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="M30.999 31.005v-3h-6.762s.812-12.397 1.162-14 .597-3.35 2.628-3.103 1.971 3.103 1.971 3.103l4.862-.016s-.783-3.984-2.783-5.984-7.946-1.7-9.633.03c-1.687 1.73-2.302 5.065-2.597 6.422-.588 4.5-.854 9.027-1.248 13.547h-8.6v3H18.1s-.812 12.398-1.162 14-.597 3.35-2.628 3.103-1.972-3.102-1.972-3.102l-4.862.015s.783 3.985 2.783 5.985c2 2 7.946 1.699 9.634-.031 1.687-1.73 2.302-5.065 2.597-6.422.587-4.5.854-9.027 1.248-13.547z" fill="#fff"/></svg>
diff --git a/templates/function/node.html.mustache b/templates/function/node.html.mustache
@@ -1,11 +1,11 @@
-<script type="text/x-red" data-template-name="{{&nodeName}}">
+<script type="text/html" data-template-name="{{&nodeName}}">
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="node-red:common.label.name"></span></label>
         <input type="text" id="node-input-name" data-i18n="[placeholder]node-red:common.label.name">
     </div>
 </script>
 
-<script type="text/x-red" data-help-name="{{&nodeName}}">
+<script type="text/html" data-help-name="{{&nodeName}}">
     <p>Summary of the node.</p>
     <h3>Inputs</h3>
     <dl class="message-properties">
diff --git a/templates/swagger/node.html.mustache b/templates/swagger/node.html.mustache
@@ -124,7 +124,7 @@
     {{/hasServiceParams}}
 
     <div class="form-row">
-        <label for="node-input-method"><i class="icon-tasks"></i> <span data-i18n="{{&className}}.label.method"></span></label>
+        <label for="node-input-method"><i class="fa fa-tasks"></i> <span data-i18n="{{&className}}.label.method"></span></label>
         <select id="node-input-method">
             {{#methods}}
             <option value="{{&methodName}}" data-i18n="{{&className}}.parameters.{{&methodName}}"></option>
diff --git a/templates/webofthings/node.html.mustache b/templates/webofthings/node.html.mustache
@@ -201,7 +201,7 @@
     });
 </script>
 
-<script type="text/x-red" data-template-name="{{&nodeName}}">
+<script type="text/html" data-template-name="{{&nodeName}}">
     <div class="form-row">
         <label for="node-input-interactiontype"><i class="fa fa-exchange"></i> Interaction</label>
         <select id="node-input-interactiontype">
@@ -263,7 +263,7 @@
     </div>
 </script>
 
-<script type="text/x-red" data-help-name="{{&nodeName}}">
+<script type="text/html" data-help-name="{{&nodeName}}">
 <p dir="{{textdir}}">{{description}}</p>
 
 <h3>Inputs</h3>
diff --git a/test/lib/nodegen_spec.js b/test/lib/nodegen_spec.js
@@ -17,7 +17,7 @@ describe('nodegen library', function () {
                 fs.statSync(result + '/node.html').size.should.be.above(0);
                 fs.statSync(result + '/node.js').size.should.be.above(0);
                 fs.statSync(result + '/test/node_spec.js').size.should.be.above(0);
-                fs.statSync(result + '/icons/icon.png').size.should.be.above(0);
+                fs.statSync(result + '/icons/icon.svg').size.should.be.above(0);
                 fs.statSync(result + '/README.md').size.should.be.above(0);
                 fs.statSync(result + '/LICENSE').size.should.be.above(0);
                 fs.statSync(result + '/.travis.yml').size.should.be.above(0);
