Commit 105c245

committed

Merge branch 'vuejs.org-master' into 2.0-cn

# Conflicts: # src/v2/guide/comparison.md

2 parents 5172a05 + f4125ac commit 105c245Copy full SHA for 105c245

File tree

+23

-2

lines changed

+23

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<div id="header">`
`2`	`2`	`<a id="logo" href="/">`
`3`	`3`	`<img src="/images/logo.png">`
`4`		`- <span>Vue.js <span style="font-size: 12px;">(2017.02.19更新,合并vuejs.org更新!)</span></span>`
	`4`	`+ <span>Vue.js <span style="font-size: 12px;">(2017.02.20更新,合并vuejs.org更新!)</span></span>`
`5`	`5`	`</a>`
`6`	`6`	`<a style="`
`7`	`7`	`position: absolute;`

Lines changed: 22 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`/**`
`95`		`- * Mobile burger menu button for toggling sidebar`
	`95`	`+ * Mobile burger menu button and gesture for toggling sidebar`
`96`	`96`	`*/`
`97`	`97`
`98`	`98`	`function initMobileMenu () {`
`@@ -109,6 +109,27 @@`
`109`	`109`	`sidebar.classList.remove('open')`
`110`	`110`	`}`
`111`	`111`	`})`
	`112`	`+`
	`113`	`+ // Toggle sidebar on swipe`
	`114`	`+ var start = {}, end = {}`
	`115`	`+`
	`116`	`+ document.body.addEventListener('touchstart', function (e) {`
	`117`	`+ start.x = e.changedTouches[0].clientX`
	`118`	`+ start.y = e.changedTouches[0].clientY`
	`119`	`+ })`
	`120`	`+`
	`121`	`+ document.body.addEventListener('touchend', function (e) {`
	`122`	`+ end.y = e.changedTouches[0].clientY`
	`123`	`+ end.x = e.changedTouches[0].clientX`
	`124`	`+`
	`125`	`+ var xDiff = end.x - start.x`
	`126`	`+ var yDiff = end.y - start.y`
	`127`	`+`
	`128`	`+ if (Math.abs(xDiff) > Math.abs(yDiff)) {`
	`129`	`+ if (xDiff > 0) sidebar.classList.add('open')`
	`130`	`+ else sidebar.classList.remove('open')`
	`131`	`+ }`
	`132`	`+ })`
`112`	`133`	`}`
`113`	`134`
`114`	`135`	`/**`

Comments

(0)