The code sample is missing.
');
+ const src = this.path ? this.path + (this.region ? '#' + this.region : '') : '';
+ const srcMsg = src ? ` for
${src}` : '.';
+ this.setCodeHtml(`The code sample is missing${srcMsg}
`);
return;
}
@@ -117,7 +136,7 @@ export class CodeComponent implements OnChanges {
// if no linenums, enable line numbers if more than one line
return linenums == null || linenums === NaN ?
- (this.code.match(/\n/g) || []).length > 1 : linenums;
+ (this.code.match(/\n/g) || []).length > defaultLineNumsCount : linenums;
}
}
diff --git a/aio/tools/transforms/examples-package/processors/render-examples.js b/aio/tools/transforms/examples-package/processors/render-examples.js
index 35ecde9ac7..670dd0792a 100644
--- a/aio/tools/transforms/examples-package/processors/render-examples.js
+++ b/aio/tools/transforms/examples-package/processors/render-examples.js
@@ -17,8 +17,6 @@ module.exports = function renderExamples(getExampleRegion) {
if (attrMap.path) {
// We found a path attribute so look up the example and rebuild the HTML
const exampleContent = getExampleRegion(doc, attrMap.path, attrMap.region);
- delete attrMap.path;
- delete attrMap.region;
attributes = Object.keys(attrMap).map(key => ` ${key}="${attrMap[key].replace(/"/g, '"')}"`).join('');
return `<${element}${attributes}>\n${exampleContent}\n`;
}
diff --git a/aio/tools/transforms/examples-package/processors/render-examples.spec.js b/aio/tools/transforms/examples-package/processors/render-examples.spec.js
index b02580a06f..c0e1f90a1f 100644
--- a/aio/tools/transforms/examples-package/processors/render-examples.spec.js
+++ b/aio/tools/transforms/examples-package/processors/render-examples.spec.js
@@ -45,7 +45,7 @@ describe('renderExamples processor', () => {
{ renderedContent: `<${CODE_TAG} path="test/url">Some code`}
];
processor.$process(docs);
- expect(docs[0].renderedContent).toEqual(`<${CODE_TAG}>\nwhole file\n`);
+ expect(docs[0].renderedContent).toEqual(`<${CODE_TAG} path="test/url">\nwhole file\n`);
});
it(`should replace all instances of <${CODE_TAG}> tags`, () => {
@@ -53,7 +53,7 @@ describe('renderExamples processor', () => {
{ renderedContent: `<${CODE_TAG} path="test/url">Some code<${CODE_TAG} path="test/url" region="region-1">Other code`}
];
processor.$process(docs);
- expect(docs[0].renderedContent).toEqual(`<${CODE_TAG}>\nwhole file\n<${CODE_TAG}>\nregion 1 contents\n`);
+ expect(docs[0].renderedContent).toEqual(`<${CODE_TAG} path="test/url">\nwhole file\n<${CODE_TAG} path="test/url" region="region-1">\nregion 1 contents\n`);
});
it('should contain the region contents from the example file if a region is specified', () => {
@@ -61,7 +61,7 @@ describe('renderExamples processor', () => {
{ renderedContent: `<${CODE_TAG} path="test/url" region="region-1">Some code` }
];
processor.$process(docs);
- expect(docs[0].renderedContent).toEqual(`<${CODE_TAG}>\nregion 1 contents\n`);
+ expect(docs[0].renderedContent).toEqual(`<${CODE_TAG} path="test/url" region="region-1">\nregion 1 contents\n`);
});
it(`should replace the content of the <${CODE_TAG}> tag with the whole contents from an example file if the region is empty`, () => {
@@ -69,15 +69,16 @@ describe('renderExamples processor', () => {
{ renderedContent: `<${CODE_TAG} path="test/url" region="">Some code` }
];
processor.$process(docs);
- expect(docs[0].renderedContent).toEqual(`<${CODE_TAG}>\nwhole file\n`);
+ expect(docs[0].renderedContent).toEqual(`<${CODE_TAG} path="test/url" region="">\nwhole file\n`);
});
- it('should remove the path and region attributes but leave the other attributes alone', () => {
- const docs = [
- { renderedContent: `<${CODE_TAG} class="special" path="test/url" linenums="15" region="region-1" id="some-id">Some code` }
+ it('should pass along all attributes including path and region', () => {
+ const openTag = `<${CODE_TAG} class="special" path="test/url" linenums="15" region="region-1" id="some-id">`;
+
+ const docs = [ { renderedContent: `${openTag}Some code` }
];
processor.$process(docs);
- expect(docs[0].renderedContent).toEqual(`<${CODE_TAG} class="special" linenums="15" id="some-id">\nregion 1 contents\n`);
+ expect(docs[0].renderedContent).toEqual(`${openTag}\nregion 1 contents\n`);
});
it('should cope with spaces and double quotes inside attribute values', () => {
@@ -85,7 +86,7 @@ describe('renderExamples processor', () => {
{ renderedContent: `<${CODE_TAG} title='a "quoted" value' path="test/url">`}
];
processor.$process(docs);
- expect(docs[0].renderedContent).toEqual(`<${CODE_TAG} title="a "quoted" value">\nwhole file\n`);
+ expect(docs[0].renderedContent).toEqual(`<${CODE_TAG} title="a "quoted" value" path="test/url">\nwhole file\n`);
});
})
);