Merge branch 'develop' into feature-customizableSidebarItemName

Author: jhildenbiddle

Diff for: src/core/util/str.js

@@ -5,3 +5,12 @@ export function startsWith(str, prefix) {
 export function endsWith(str, suffix) {
   return str.indexOf(suffix, str.length - suffix.length) !== -1;
 }
+
+export function removeDocsifyIgnoreTag(str) {
+  return str
+    .replace(/<!-- {docsify-ignore} -->/, '')
+    .replace(/{docsify-ignore}/, '')
+    .replace(/<!-- {docsify-ignore-all} -->/, '')
+    .replace(/{docsify-ignore-all}/, '')
+    .trim();
+}

Diff for: src/plugins/search/search.js

@@ -1,5 +1,6 @@
 /* eslint-disable no-unused-vars */
 import { getAndRemoveConfig } from '../../core/render/utils';
+import { removeDocsifyIgnoreTag } from '../../core/util/str';
 
 let INDEXS = {};
 
@@ -89,19 +90,16 @@ export function genIndex(path, content = '', router, depth) {
     if (token.type === 'heading' && token.depth <= depth) {
       const { str, config } = getAndRemoveConfig(token.text);
 
+      const text = removeDocsifyIgnoreTag(token.text);
+
       if (config.id) {
         slug = router.toURL(path, { id: slugify(config.id) });
       } else {
-        slug = router.toURL(path, { id: slugify(escapeHtml(token.text)) });
+        slug = router.toURL(path, { id: slugify(escapeHtml(text)) });
       }
 
       if (str) {
-        title = str
-          .replace(/<!-- {docsify-ignore} -->/, '')
-          .replace(/{docsify-ignore}/, '')
-          .replace(/<!-- {docsify-ignore-all} -->/, '')
-          .replace(/{docsify-ignore-all}/, '')
-          .trim();
+        title = removeDocsifyIgnoreTag(str);
       }
 
       index[slug] = { slug, title: title, body: '' };