Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: zoom image plugin issue, fixed #187 #300

Merged
merged 1 commit into from
Oct 31, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions docs/plugins.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,13 @@ Medium's Image Zoom. Based on [zoom-image](https://github.com/egoist/zoom-image)
<script src="//unpkg.com/docsify/lib/plugins/zoom-image.min.js"></script>
```

Exclude the special image

```markdown
![](image.png ':no-zoom')
```


## Edit on github

Add `Edit on github` button on every pages. provided by 3rd party, check [document](https://github.com/njleonzhang/docsify-edit-on-github)
Expand Down
10 changes: 5 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
},
"dependencies": {
"marked": "^0.3.6",
"medium-zoom": "^0.2.0",
"prismjs": "^1.6.0",
"tinydate": "^1.0.0",
"tweezer.js": "^1.4.0",
"zoom-image": "^0.1.4"
"tweezer.js": "^1.4.0"
},
"devDependencies": {
"conventional-changelog-cli": "^1.3.2",
Expand Down
45 changes: 32 additions & 13 deletions src/core/render/compiler.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,20 @@ import { isAbsolutePath, getPath } from '../router/util'
import { isFn, merge, cached } from '../util/core'

const cachedLinks = {}
function getAndRemoveConfig (str = '') {
const config = {}

if (str) {
str = str
.replace(/:([\w-]+)=?([\w-]+)?/g, (m, key, value) => {
config[key] = value || true
return ''
})
.trim()
}

return { str, config }
}

export class Compiler {
constructor (config, router) {
Expand Down Expand Up @@ -102,16 +116,9 @@ export class Compiler {
}
origin.link = renderer.link = function (href, title = '', text) {
let attrs = ''
const config = {}

if (title) {
title = title
.replace(/:(\w+)=?(\w+)?/g, (m, key, value) => {
config[key] = value || true
return ''
})
.trim()
}
const { str, config } = getAndRemoveConfig(title)
title = str

if (
!/:|(\/{2})/.test(href) &&
Expand All @@ -133,9 +140,10 @@ export class Compiler {
}

if (title) {
title = ` title="${title}"`
attrs += ` title="${title}"`
}
return `<a href="${href}"${title || ''}${attrs}>${text}</a>`

return `<a href="${href}"${attrs}>${text}</a>`
}
origin.paragraph = renderer.paragraph = function (text) {
if (/^!&gt;/.test(text)) {
Expand All @@ -147,13 +155,24 @@ export class Compiler {
}
origin.image = renderer.image = function (href, title, text) {
let url = href
const titleHTML = title ? ` title="${title}"` : ''
let attrs = ''

const { str, config } = getAndRemoveConfig(title)
title = str

if (config['no-zoom']) {
attrs += ' data-no-zoom'
}

if (title) {
attrs += ` title="${title}"`
}

if (!isAbsolutePath(href)) {
url = getPath(contentBase, href)
}

return `<img src="${url}" data-origin="${href}" alt="${text}"${titleHTML}>`
return `<img src="${url}"data-origin="${href}" alt="${text}"${attrs}>`
}

renderer.origin = origin
Expand Down
18 changes: 5 additions & 13 deletions src/plugins/zoom-image.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,14 @@
import zoom from 'zoom-image'
import style from 'zoom-image/css/zoom-image.css'
import mediumZoom from 'medium-zoom'

function install (hook) {
const dom = Docsify.dom
let destroys

// add style
dom.appendTo(dom.head, dom.create('style', style))
let zoom

hook.doneEach(_ => {
const images = dom.findAll('img:not(.emoji)')

if (Array.isArray(destroys) && destroys.length) {
destroys.forEach(o => o())
destroys = []
if (zoom) {
zoom.detach()
}

destroys = images.map(zoom)
zoom = mediumZoom('img:not(.emoji):not([data-no-zoom])')
})
}

Expand Down
6 changes: 2 additions & 4 deletions src/themes/basic/_layout.css
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ main {
display: block;
position: relative;
size: 100vw 100%;
z-index: 0;
}

.anchor {
Expand Down Expand Up @@ -450,10 +451,7 @@ body.close {
@media print {
.github-corner,
.sidebar-toggle,
.sidebar {
display: none;
}

.sidebar,
.app-nav {
display: none;
}
Expand Down