Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
electric-el committed May 26, 2022
2 parents 8fd0e7c + 0861457 commit f15d777
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion scripts/pattern/annotations-viewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@

const messageObj = {
annotationsUpdate: true,
annotations: annotations,
annotations,
patternPartial
};

Expand Down
8 changes: 4 additions & 4 deletions test/unit/annotations-viewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,8 @@ describe('annotationsViewer', function () {
expect(sgAnnotationsAfter.html).to.equal(`<div id="annotation-1" class="sg-annotation">
<h2>1. Navigation</h2>
<div><p>Navigation for responsive web experiences can be tricky. Large navigation menus
are typical on desktop sites, but mobile screen sizes don't give us the luxury
of space. We're dealing with this situation by creating a simple menu anchor
are typical on desktop sites, but mobile screen sizes don&apos;t give us the luxury
of space. We&apos;re dealing with this situation by creating a simple menu anchor
that toggles the main navigation on small screens. Once the screen size is large
enough to accommodate the nav, we show the main navigation links and hide the
menu anchor.</p>
Expand Down Expand Up @@ -360,8 +360,8 @@ menu anchor.</p>
expect(sgAnnotationsAfter.html).to.equal(`<div id="annotation-1" class="sg-annotation">
<h2>1. Navigation</h2>
<div><p>Navigation for responsive web experiences can be tricky. Large navigation menus
are typical on desktop sites, but mobile screen sizes don't give us the luxury
of space. We're dealing with this situation by creating a simple menu anchor
are typical on desktop sites, but mobile screen sizes don&apos;t give us the luxury
of space. We&apos;re dealing with this situation by creating a simple menu anchor
that toggles the main navigation on small screens. Once the screen size is large
enough to accommodate the nav, we show the main navigation links and hide the
menu anchor.</p>
Expand Down
8 changes: 4 additions & 4 deletions test/unit/code-viewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -1386,11 +1386,11 @@ describe('codeViewer', function () {
expect(sgCodeLineageAfter.css.display).to.equal('block');
expect(sgCodeLineageFillAfter.html).to.equal(
// eslint-disable-next-line indent
'<a href="patterns/00-elements-paragraph/00-elements-paragraph.html" class="">elements-paragraph</a>');
'<a href="patterns/00-elements-paragraph/00-elements-paragraph.html" class>elements-paragraph</a>');
expect(sgCodeLineagerAfter.css.display).to.equal('block');
expect(sgCodeLineagerFillAfter.html).to.equal(
// eslint-disable-next-line indent
'<a href="patterns/02-components-region/02-components-region.html" class="">components-region</a>');
'<a href="patterns/02-components-region/02-components-region.html" class>components-region</a>');
expect(codeViewer.viewall).to.be.true;
});

Expand Down Expand Up @@ -1446,11 +1446,11 @@ describe('codeViewer', function () {
expect(sgCodeLineageAfter.css.display).to.equal('block');
expect(sgCodeLineageFillAfter.html).to.equal(
// eslint-disable-next-line indent
'<a href="patterns/00-elements-paragraph/00-elements-paragraph.html" class="">elements-paragraph</a>');
'<a href="patterns/00-elements-paragraph/00-elements-paragraph.html" class>elements-paragraph</a>');
expect(sgCodeLineagerAfter.css.display).to.equal('block');
expect(sgCodeLineagerFillAfter.html).to.equal(
// eslint-disable-next-line indent
'<a href="patterns/02-components-region/02-components-region.html" class="">components-region</a>');
'<a href="patterns/02-components-region/02-components-region.html" class>components-region</a>');
expect(codeViewer.viewall).to.be.false;
});

Expand Down
6 changes: 3 additions & 3 deletions test/unit/zit-inyerface.js
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ content_key: content
/* eslint-disable indent */
expect(messageGitNaStateAfter.html).to.equal(
`<pre class="sg-code-pane-content-warning"><code>Command failed: git remote --verbose
'git' is not recognized as an internal or external command, operable program or batch file.</code></pre>`);
&apos;git&apos; is not recognized as an internal or external command, operable program or batch file.</code></pre>`);
/* eslint-enable indent */
expect(paneGitNaStateAfter.css.display).to.equal('block');
expect(paneGitStateAfter.css).to.not.have.key('display');
Expand Down Expand Up @@ -810,7 +810,7 @@ content_key: content
/* eslint-disable indent */
expect(messageGitNaStateAfter.html).to.equal(
`<pre class="sg-code-pane-content-warning"><code>Command failed: git remote --verbose
'git' is not recognized as an internal or external command, operable program or batch file.</code></pre>`);
&apos;git&apos; is not recognized as an internal or external command, operable program or batch file.</code></pre>`);
/* eslint-enable indent */
expect(paneGitNaStateAfter.css.display).to.equal('block');
expect(paneGitStateAfter.css).to.not.have.key('display');
Expand Down Expand Up @@ -980,7 +980,7 @@ content_key: content
/* eslint-disable indent */
expect(messageGitNaStateAfter.html).to.equal(
`<pre class="sg-code-pane-content-warning"><code>Command failed: git remote --verbose
'git' is not recognized as an internal or external command, operable program or batch file.</code></pre>`);
&apos;git&apos; is not recognized as an internal or external command, operable program or batch file.</code></pre>`);
/* eslint-enable indent */
expect(paneGitNaStateAfter.css.display).to.equal('block');
expect(paneGitStateAfter.css).to.not.have.key('display');
Expand Down

0 comments on commit f15d777

Please sign in to comment.