Commit 5a6ee81

authored

Merge pull request #16 from 40818419/fix/ssr

fix(ssr): fixing server side rendering

2 parents 7fdaa65 + f977114 commit 5a6ee81Copy full SHA for 5a6ee81

File tree

4 files changed

+23

-11

lines changed

lib
src
- vue-parallax-js.js

4 files changed

+23

-11

lines changed

`‎lib/vue-parallax-js.cjs.js`

Lines changed: 1 addition & 1 deletion

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

`‎lib/vue-parallax-js.es.js`

Lines changed: 1 addition & 1 deletion

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

`‎lib/vue-parallax-js.js`

Lines changed: 1 addition & 1 deletion

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

`‎src/vue-parallax-js.js`

Lines changed: 20 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,12 @@`
`1`	`1`	`// @flow`
	`2`	`+if (typeof window === 'undefined') {`
	`3`	`+ global.window = null`
	`4`	`+}`
	`5`	`+`
	`6`	`+if (typeof document === 'undefined') {`
	`7`	`+ global.document = null`
	`8`	`+}`
	`9`	`+`
`2`	`10`	`const ParallaxJS = function (os) {`
`3`	`11`	`this.os = os`
`4`	`12`	`}`
`@@ -7,9 +15,9 @@ ParallaxJS.prototype = {`
`7`	`15`	`items: [],`
`8`	`16`	`active: true,`
`9`	`17`
`10`		`- tProp: window.transformProp \|\| (function () {`
`11`		`- const testEl = document.createElement('div')`
`12`		`- if (testEl.style.transform == null) {`
	`18`	`+ tProp: window&&window.transformProp \|\| (function () {`
	`19`	`+ const testEl = document ? document.createElement('div') : null`
	`20`	`+ if (testEl&&testEl.style.transform == null) {`
`13`	`21`	`const vs = ['Webkit', 'Moz', 'ms']`
`14`	`22`	`const t = 'Transform'`
`15`	`23`	`for (const v of vs) {`
`@@ -22,6 +30,7 @@ ParallaxJS.prototype = {`
`22`	`30`	`})(),`
`23`	`31`
`24`	`32`	`add (el, binding) {`
	`33`	`+ if (!window) return`
`25`	`34`	`const value = binding.value`
`26`	`35`	`const arg = binding.arg`
`27`	`36`	`const style = el.currentStyle \|\| window.getComputedStyle(el)`
`@@ -47,15 +56,17 @@ ParallaxJS.prototype = {`
`47`	`56`	`count: 0`
`48`	`57`	`})`
`49`	`58`	`},`
`50`		`- update() {`
`51`		`- this.items.forEach(function(item) {`
`52`		`- let t = item.el;`
`53`		`- n = t.currentStyle \|\| window.getComputedStyle(t);`
	`59`	`+ update () {`
	`60`	`+ if (!window) return`
	`61`	`+ this.items.forEach(function (item) {`
	`62`	`+ const t = item.el`
	`63`	`+ const n = t.currentStyle \|\| window.getComputedStyle(t)`
`54`	`64`	`item.height = item.mod.absY ? window.innerHeight : t.clientHeight \|\| t.scrollHeight`
`55`	`65`	`item.iOT = t.offsetTop + t.offsetParent.offsetTop - parseInt(n.marginTop)`
`56`	`66`	`})`
`57`	`67`	`},`
`58`	`68`	`move () {`
	`69`	`+ if (!window) return`
`59`	`70`	`if (!this.active) return`
`60`	`71`	`if (window.innerWidth < this.os.minWidth \|\| 0) {`
`61`	`72`	`this.items.forEach((item) => {`
`@@ -84,7 +95,8 @@ ParallaxJS.prototype = {`
`84`	`95`
`85`	`96`	`export default {`
`86`	`97`	`install (Vue, os = {}) {`
`87`		`- var p = new ParallaxJS(os)`
	`98`	`+ if (!window) return`
	`99`	`+ const p = new ParallaxJS(os)`
`88`	`100`
`89`	`101`	`window.addEventListener('scroll', () => {`
`90`	`102`	`p.move(p)`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 5a6ee81

File tree

4 files changed

4 files changed

`‎lib/vue-parallax-js.cjs.js`

`‎lib/vue-parallax-js.es.js`

`‎lib/vue-parallax-js.js`

`‎src/vue-parallax-js.js`

0 commit comments