feat: add search, close #43

docsifyjs · Feb 8, 2017 · 902383c · 902383c
1 parent 7d6f631
commit 902383c
Show file tree

Hide file tree

Showing 10 changed files with 395 additions and 16 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -1,7 +1,9 @@
 {
   "extends": ["vue"],
+  "env": {
+    "browser": true
+  },
   "globals": {
-    "XMLHttpRequest": true,
-    "__docsify__": true
+    "$docsify": true
   }
 }
diff --git a/build/build-css.js b/build/build-css.js
@@ -2,6 +2,7 @@ var fs = require('fs')
 var cssnano = require('cssnano').process
 var resolve = require('path').resolve
 var postcss = require('postcss')
+var isProd = process.argv[process.argv.length - 1] !== '--dev'
 
 var processor = postcss([require('postcss-salad')({
   features: {
@@ -34,7 +35,7 @@ list.forEach(function (file) {
     .then(function (result) {
       save(file, result.css)
       console.log('salad - ' + file)
-      cssnano(loadLib(file))
+      isProd && cssnano(loadLib(file))
         .then(function (result) {
           saveMin(file, result.css)
           console.log('cssnao - ' + file)

diff --git a/build/build.js b/build/build.js
@@ -3,6 +3,7 @@ var buble = require('rollup-plugin-buble')
 var commonjs = require('rollup-plugin-commonjs')
 var nodeResolve = require('rollup-plugin-node-resolve')
 var uglify = require('rollup-plugin-uglify')
+var isProd = process.argv[process.argv.length - 1] !== '--dev'
 
 var build = function (opts) {
   rollup
@@ -16,7 +17,7 @@ var build = function (opts) {
       console.log(dest)
       bundle.write({
         format: 'iife',
-        moduleName: opts.moduleName || 'Docsify',
+        moduleName: opts.moduleName || 'D',
         dest: dest
       })
     })
@@ -30,8 +31,19 @@ build({
   output: 'docsify.js',
   plugins: [commonjs(), nodeResolve()]
 })
-build({
+isProd && build({
   entry: 'index.js',
   output: 'docsify.min.js',
   plugins: [commonjs(), nodeResolve(), uglify()]
 })
+build({
+  entry: 'plugins/search.js',
+  output: 'plugins/search.js',
+  moduleName: 'D.Search'
+})
+isProd && build({
+  entry: 'plugins/search.js',
+  output: 'plugins/search.min.js',
+  moduleName: 'D.Search',
+  plugins: [uglify()]
+})
diff --git a/dev.html b/dev.html
@@ -6,7 +6,24 @@
   <link rel="stylesheet" href="/themes/vue.css">
 </head>
 <body>
+  <nav>
+    <a href="#/">En</a>
+    <a href="#/zh-cn">中文</a>
+  </nav>
   <div id="app"></div>
 </body>
-<script src="/lib/docsify.js" data-repo="qingwei-li/docsify" data-name="docsify" data-auto2top></script>
+<script>
+  window.$docsify = {
+    search: {
+      maxAge: 0
+    }
+  }
+</script>
+<script
+  src="/lib/docsify.js"
+  data-repo="qingwei-li/docsify"
+  data-name="docsify"
+  data-base-path="docs/"
+  data-auto2top></script>
+<script src="/lib/plugins/search.js"></script>
 </html>
diff --git a/package.json b/package.json
@@ -10,7 +10,8 @@
   ],
   "scripts": {
     "build": "rm -rf lib themes && node build/build.js && mkdir lib/themes && mkdir themes && node build/build-css.js",
-    "dev": "node app.js & nodemon -w src -e js,css --exec 'npm run build'",
+    "dev:build": "rm -rf lib themes && mkdir themes && node build/build.js --dev && node build/build-css.js --dev",
+    "dev": "node app.js & nodemon -w src -e js,css --exec 'npm run dev:build'",
     "test": "eslint src test"
   },
   "repository": {

diff --git a/src/event.js b/src/event.js
@@ -9,7 +9,7 @@ export function scrollActiveSidebar () {
 
   let hoveredOverSidebar = false
   const anchors = document.querySelectorAll('.anchor')
-  const sidebar = document.querySelector('.sidebar>div')
+  const sidebar = document.querySelector('.sidebar')
   const sidebarHeight = sidebar.clientHeight
 
   const nav = {}