Skip to content

Fix several b-modal selector names #1218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ang-zeyu merged 1 commit into from
May 4, 2020
Merged

Fix several b-modal selector names #1218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ class Page {
return;
}
const $ = cheerio.load(content);
$('modal').remove();
$('b-modal').remove();
this._collectNavigableHeadings($, $.root()[0], elementSelector);
}

Expand Down Expand Up @@ -405,7 +405,7 @@ class Page {
collectHeadingsAndKeywordsInContent(content, lastHeading, excludeHeadings, sourceTraversalStack) {
let $ = cheerio.load(content);
const headingsSelector = Page.generateHeadingSelector(this.headingIndexingLevel);
$('modal').remove();
$('b-modal').remove();
$('panel').not('panel panel')
.each((index, panel) => {
const slotHeader = $(panel).children('[slot="header"]');
Expand Down Expand Up @@ -468,7 +468,7 @@ class Page {
});
$ = cheerio.load(content);
if (this.headingIndexingLevel > 0) {
$('modal').remove();
$('b-modal').remove();
$('panel').remove();
if (!excludeHeadings) {
$(headingsSelector).each((i, heading) => {
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/algolia.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function addNoIndexClasses(content) {
const $ = cheerio.load(content, { xmlMode: false });
const noIndexSelectors = [
'dropdown',
'modal',
'b-modal',
'panel:not([expanded])',
'popover div[slot=content]',
'question div[slot=hint]',
Expand Down
1 change: 0 additions & 1 deletion test/functional/test_site/expected/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,6 @@ <h6 class="always-index" id="level-6-header-outside-headingsearchindex-with-alwa
<a class="nav-link py-1" href="#inner-panel-header-without-src">Inner panel header without src&#x200E;</a>
<a class="nav-link py-1" href="#panel-with-src-from-another-markbind-site-header">Panel with src from another Markbind site header&#x200E;</a>
<a class="nav-link py-1" href="#panel-with-src-from-another-markbind-site-header-2">Panel with src from another Markbind site header&#x200E;</a>
<a class="nav-link py-1" href="#panel-inside-modal">Panel inside modal&#x200E;</a>
<a class="nav-link py-1" href="#unexpanded-panel-header">Unexpanded panel header&#x200E;</a>
</nav>
<a class="nav-link py-1" href="#markbind-plugin-pre-render">Markbind Plugin Pre-render&#x200E;</a>
Expand Down
1 change: 0 additions & 1 deletion test/functional/test_site/expected/siteData.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
"outer-nested-panel-without-src": "Outer nested panel without src",
"panel-with-src-from-another-markbind-site-header": "Panel with src from another Markbind site header",
"panel-with-src-from-another-markbind-site-header-2": "Panel with src from another Markbind site header",
"panel-inside-modal": "Panel inside modal",
"unexpanded-panel-header": "Unexpanded panel header",
"keyword-should-be-tagged-to-this-heading-not-the-panel-heading": "Keyword should be tagged to this heading, not the panel heading",
"panel-normal-source-content-headings": "Panel normal source content headings",
Expand Down
2 changes: 1 addition & 1 deletion test/functional/test_site_algolia_plugin/expected/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<li><a class="dropdown-item" href="/">Two</a></li>
</dropdown>
<p><strong>Modal content should have algolia-no-index class</strong></p>
<b-modal id="modal:trigger_id" hide-footer="" size="" modal-class="mb-zoom" ref="modal:trigger_id"><template slot="modal-title">Modal</template>
<b-modal id="modal:trigger_id" hide-footer="" size="" modal-class="mb-zoom" ref="modal:trigger_id" class="algolia-no-index"><template slot="modal-title">Modal</template>
Content should have `algolia-no-index` class
</b-modal>
<span for="modal:trigger_id" v-b-popover.hover.top.html="popoverGenerator" v-b-tooltip.hover.top.html="tooltipContentGetter" v-on:mouseover="$refs['modal:trigger_id'].show()" class="trigger">Trigger should not have `algolia-no-index` class</span>
Expand Down