fix: 修复 issuse #35，scrollElement 参数设置为 DOM 节点报错问题；

yaohaixiao · Oct 13, 2023 · 5836750 · 5836750
1 parent 1089588
commit 5836750
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 8 deletions.
diff --git a/api/pug/script.pug b/api/pug/script.pug
@@ -8,7 +8,7 @@ script.
   defaults.showCode = false
   defaults.position = 'sticky'
   defaults.parentElement = '#aside'
-  defaults.scrollElement = '#main'
+  defaults.scrollElement = document.querySelector('#main')
   defaults.articleElement = '#article'
   defaults.git = 'https://github.com/yaohaixiao/outline.js'
   defaults.tags = 'https://github.com/yaohaixiao/outline.js/tags'

diff --git a/docs/index.html b/docs/index.html
@@ -1115,7 +1115,7 @@
 defaults.showCode = false
 defaults.position = 'sticky'
 defaults.parentElement = '#aside'
-defaults.scrollElement = '#main'
+defaults.scrollElement = document.querySelector('#main')
 defaults.articleElement = '#article'
 defaults.git = 'https://github.com/yaohaixiao/outline.js'
 defaults.tags = 'https://github.com/yaohaixiao/outline.js/tags'

diff --git a/docs/js/outline.min.js b/docs/js/outline.min.js
diff --git a/docs/js/outline.min.js.map b/docs/js/outline.min.js.map
diff --git a/outline.js b/outline.js
@@ -57,7 +57,13 @@ class Outline extends Base {
   render() {
     const hasToolbar = this.attr('hasToolbar')
     const scrollElement = this.attr('scrollElement')
-    const $scrollElement = document.querySelector(scrollElement)
+    let $scrollElement
+
+    if (isString(scrollElement)) {
+      $scrollElement = document.querySelector(scrollElement)
+    } else if (isElement(scrollElement)) {
+      $scrollElement = scrollElement
+    }
 
     this._renderPrint()._renderAnchors()._renderChapters()._renderToolbar()
 

diff --git a/outline.min.js b/outline.min.js
diff --git a/outline.min.js.map b/outline.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@yaohaixiao/outline.js",
-  "version": "3.30.0",
+  "version": "3.30.1",
   "description": "outline.js - 自动生成文章导读（Table of Contents）导航的 JavaScript 工具。",
   "main": "outline.min.js",
   "files": [