[release] 4.1.14

Filter picture

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+4.1.14 / 2017-06-24
+
+  * feat: add context attribute, fixed #191
+  * fix: get file path
+  * Merge pull request #195 from crawt/master
+  * Filter picture
+  * Update doc for external link target (#194)
+
 4.1.13 / 2017-06-11
 
   * fix ga

dev.html

@@ -33,11 +33,10 @@
     subMaxLevel: 0,
     mergeNavbar: true,
     formatUpdated: '{MM}/{DD} {HH}:{mm}',
-    routerMode: 'history',
     plugins: [
       function(hook, vm) {
         hook.beforeEach(function (html) {
-          var url = 'https://github.com/QingWei-Li/docsify/blob/master' + vm.router.getFile()
+          var url = 'https://github.com/QingWei-Li/docsify/blob/master/' + vm.route.file
           var editHtml = '[:memo: Edit Document](' + url + ')\n'
 
           return editHtml

docs/_coverpage.md

@@ -1,6 +1,6 @@
 ![logo](_media/icon.svg)
 
-# docsify <small>4.1.13</small>
+# docsify <small>4.1.14</small>
 
 > A magical documentation site generator.
 

docs/configuration.md

@@ -333,7 +333,7 @@ window.$docsify = {
 
 ## external-link-target
 
-Currently it defaults to _blank, would be nice if configurable:
+Target to open external links. Default `'_blank'` (new window/tab)
 
 ```js
 window.$docsify = {

docs/index.html

@@ -53,7 +53,7 @@
     plugins: [
       function(hook, vm) {
         hook.beforeEach(function (html) {
-          var url = 'https://github.com/QingWei-Li/docsify/blob/master/docs' + vm.route.file
+          var url = 'https://github.com/QingWei-Li/docsify/blob/master/docs/' + vm.route.file
           var editHtml = '[:memo: Edit Document](' + url + ')\n'
 
           return editHtml

lib/docsify.js

@@ -3318,7 +3318,7 @@ History.prototype.getBasePath = function getBasePath () {
   return this.config.basePath
 };
 
-History.prototype.getFile = function getFile (path) {
+History.prototype.getFile = function getFile (path, isRelative) {
   path = path || this.getCurrentPath();
 
   var ref = this;
@@ -3330,6 +3330,10 @@ History.prototype.getFile = function getFile (path) {
   path = path === '/README.md' ? (config.homepage || path) : path;
   path = isAbsolutePath(path) ? path : getPath(base, path);
 
+  if (isRelative) {
+    path = path.replace(new RegExp(("^" + base)), '');
+  }
+
   return path
 };
 
@@ -3423,7 +3427,7 @@ var HashHistory = (function (History$$1) {
 
     return {
       path: path,
-      file: this.getFile(path),
+      file: this.getFile(path, true),
       query: parseQuery(query)
     }
   };
@@ -3536,6 +3540,12 @@ function routerMixin (proto) {
 
 var lastRoute = {};
 
+function updateRender (vm) {
+  vm.router.normalize();
+  vm.route = vm.router.parse();
+  body.setAttribute('data-page', vm.route.file);
+}
+
 function initRouter (vm) {
   var config = vm.config;
   var mode = config.routerMode || 'hash';
@@ -3548,13 +3558,11 @@ function initRouter (vm) {
   }
 
   vm.router = router;
-
-  router.normalize();
-  lastRoute = vm.route = router.parse();
+  updateRender(vm);
+  lastRoute = vm.route;
 
   router.onchange(function (_) {
-    router.normalize();
-    vm.route = router.parse();
+    updateRender(vm);
     vm._updateRender();
 
     if (lastRoute.path === vm.route.path) {
@@ -3750,7 +3758,7 @@ initGlobalAPI();
 /**
  * Version
  */
-Docsify.version = '4.1.13';
+Docsify.version = '4.1.14';
 
 /**
  * Run Docsify

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "docsify",
-  "version": "4.1.13",
+  "version": "4.1.14",
   "lockfileVersion": 1,
   "dependencies": {
     "abbrev": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "docsify",
-  "version": "4.1.13",
+  "version": "4.1.14",
   "description": "A magical documentation generator.",
   "author": {
     "name": "qingwei-li",

packages/docsify-server-renderer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docsify-server-renderer",
-  "version": "4.1.13",
+  "version": "4.1.14",
   "description": "docsify server renderer",
   "author": {
     "name": "qingwei-li",

src/core/router/history/base.js

@@ -22,7 +22,7 @@ export class History {
     return this.config.basePath
   }
 
-  getFile (path) {
+  getFile (path, isRelative) {
     path = path || this.getCurrentPath()
 
     const { config } = this
@@ -33,6 +33,10 @@ export class History {
     path = path === '/README.md' ? (config.homepage || path) : path
     path = isAbsolutePath(path) ? path : getPath(base, path)
 
+    if (isRelative) {
+      path = path.replace(new RegExp(`^${base}`), '')
+    }
+
     return path
   }
 

src/core/router/history/hash.js

@@ -71,7 +71,7 @@ export class HashHistory extends History {
 
     return {
       path,
-      file: this.getFile(path),
+      file: this.getFile(path, true),
       query: parseQuery(query)
     }
   }

src/core/router/index.js

@@ -1,6 +1,7 @@
 import { HashHistory } from './history/hash'
 import { HTML5History } from './history/html5'
 import { supportsPushState } from '../util/env'
+import * as dom from '../util/dom'
 
 export function routerMixin (proto) {
   proto.route = {}
@@ -8,6 +9,12 @@ export function routerMixin (proto) {
 
 let lastRoute = {}
 
+function updateRender (vm) {
+  vm.router.normalize()
+  vm.route = vm.router.parse()
+  dom.body.setAttribute('data-page', vm.route.file)
+}
+
 export function initRouter (vm) {
   const config = vm.config
   const mode = config.routerMode || 'hash'
@@ -20,13 +27,11 @@ export function initRouter (vm) {
   }
 
   vm.router = router
-
-  router.normalize()
-  lastRoute = vm.route = router.parse()
+  updateRender(vm)
+  lastRoute = vm.route
 
   router.onchange(_ => {
-    router.normalize()
-    vm.route = router.parse()
+    updateRender(vm)
     vm._updateRender()
 
     if (lastRoute.path === vm.route.path) {