[release] 4.1.14

Filter picture

CHANGELOG.md

@@ -1,5 +1,17 @@
 # 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
+
 4.1.12 / 2017-06-03
 
   * fix(render): ubtitle in side bar shows undefined, fixed [#182](https://github.com/QingWei-Li/docsify/issues/182)

README.md

@@ -11,6 +11,7 @@
 <p align="center">
   <a href="https://travis-ci.org/QingWei-Li/docsify"><img alt="Travis Status" src="https://img.shields.io/travis/QingWei-Li/docsify/master.svg?style=flat-square"></a>
   <a href="https://www.npmjs.com/package/docsify"><img alt="npm" src="https://img.shields.io/npm/v/docsify.svg?style=flat-square"></a>
+  <a href="https://cdnjs.com/libraries/docsify"><img alt="cdnjs" src="https://img.shields.io/cdnjs/v/docsify.svg?style=flat-square"></a>
   <a href="https://github.com/QingWei-Li/donate"><img alt="donate" src="https://img.shields.io/badge/%24-donate-ff69b4.svg?style=flat-square"></a>
   <a href="https://app.fossa.io/projects/git%2Bhttps%3A%2F%2Fgithub.com%2FQingWei-Li%2Fdocsify?ref=badge_shield" alt="FOSSA Status"><img src="https://app.fossa.io/api/projects/git%2Bhttps%3A%2F%2Fgithub.com%2FQingWei-Li%2Fdocsify.svg?type=shield"/></a>
 </p>
@@ -69,6 +70,7 @@ These projects are using docsify to generate their sites. Pull requests welcome
 | [JS MythBusters](https://mythbusters.js.org) | An optimization handbook from a high level point of view. |
 | [hire-me](https://fvcproductions.github.io/hire-me) | A path to getting an awesome tech gig. |
 | [vue-amap](https://elemefe.github.io/vue-amap/) | A Map Component Library Base on Vue 2.x and Gaode Map. |
+| [samlify](https://samlify.js.org) | Node.js SAML2 library |
 
 ## Similar projects
 

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.12</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.12';
+Docsify.version = '4.1.14';
 
 /**
  * Run Docsify

lib/plugins/ga.js

@@ -11,24 +11,21 @@ function appendScript () {
 }
 
 function init (id) {
-  var ga = window.ga;
-
-  if (!ga) {
-    appendScript();
-    ga = ga || function () {
-      (ga.q = ga.q || []).push(arguments);
-    };
-    ga.l = Number(new Date());
-    ga('create', id, 'auto');
-  }
-  return ga
+  appendScript();
+  window.ga = window.ga || function () {
+    (window.ga.q = window.ga.q || []).push(arguments);
+  };
+  window.ga.l = Number(new Date());
+  window.ga('create', id, 'auto');
 }
 
 function collect () {
-  var ga = init($docsify.ga);
+  if (!window.ga) {
+    init($docsify.ga);
+  }
 
-  ga('set', 'page', location.hash);
-  ga('send', 'pageview');
+  window.ga('set', 'page', location.hash);
+  window.ga('send', 'pageview');
 }
 
 var install = function (hook) {

lib/plugins/ga.min.js

@@ -1 +1 @@
-this.D=this.D||{},function(){"use strict";function n(){var n=document.createElement("script");n.async=!0,n.src="https://www.google-analytics.com/analytics.js",document.body.appendChild(n)}function c(c){var e=window.ga;return e||(n(),e=e||function(){(e.q=e.q||[]).push(arguments)},e.l=Number(new Date),e("create",c,"auto")),e}function e(){var n=c($docsify.ga);n("set","page",location.hash),n("send","pageview")}var i=function(n){if(!$docsify.ga)return void console.error("[Docsify] ga is required.");n.beforeEach(e)};$docsify.plugins=[].concat(i,$docsify.plugins)}();
+this.D=this.D||{},function(){"use strict";function n(){var n=document.createElement("script");n.async=!0,n.src="https://www.google-analytics.com/analytics.js",document.body.appendChild(n)}function i(i){n(),window.ga=window.ga||function(){(window.ga.q=window.ga.q||[]).push(arguments)},window.ga.l=Number(new Date),window.ga("create",i,"auto")}function o(){window.ga||i($docsify.ga),window.ga("set","page",location.hash),window.ga("send","pageview")}var a=function(n){if(!$docsify.ga)return void console.error("[Docsify] ga is required.");n.beforeEach(o)};$docsify.plugins=[].concat(a,$docsify.plugins)}();

package-lock.json

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "docsify",
-  "version": "4.1.12",
+  "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.12",
+  "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) {

src/plugins/ga.js

@@ -7,24 +7,21 @@ function appendScript () {
 }
 
 function init (id) {
-  let ga = window.ga
-
-  if (!ga) {
-    appendScript()
-    ga = ga || function () {
-      (ga.q = ga.q || []).push(arguments)
-    }
-    ga.l = Number(new Date())
-    ga('create', id, 'auto')
+  appendScript()
+  window.ga = window.ga || function () {
+    (window.ga.q = window.ga.q || []).push(arguments)
   }
-  return ga
+  window.ga.l = Number(new Date())
+  window.ga('create', id, 'auto')
 }
 
 function collect () {
-  const ga = init($docsify.ga)
+  if (!window.ga) {
+    init($docsify.ga)
+  }
 
-  ga('set', 'page', location.hash)
-  ga('send', 'pageview')
+  window.ga('set', 'page', location.hash)
+  window.ga('send', 'pageview')
 }
 
 const install = function (hook) {