Commit72c0434

committed

chore: Merge branch 'dev'

2 parents1a5d690 +fb9a2c4 commit72c0434Copy full SHA for 72c0434

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import { types as t, getParent } from 'mobx-state-tree'`
`7`	`7`	`importRfrom'ramda'`
`8`	`8`
`9`	`9`	`import{TYPE,THREAD}from'@constant'`
`10`		`-import{markStates,stripMobx,unholdPage,Global,cs}from'@utils'`
	`10`	`+import{markStates,stripMobx,holdPage,unholdPage,Global,cs}from'@utils'`
`11`	`11`	`import{User,EmptyAchievement}from'@model'`
`12`	`12`
`13`	`13`	`constPREVIEWABLE_THREADS=[THREAD.POST,THREAD.JOB,THREAD.VIDEO,THREAD.REPO]`
`@@ -121,6 +121,7 @@ const PreviewStore = t`
`121`	`121`
`122`	`122`	`self.visible=true`
`123`	`123`	`self.type=type`
	`124`	`+holdPage()`
`124`	`125`	`},`
`125`	`126`	`setViewing(sobj){`
`126`	`127`	`self.root.setViewing(sobj)`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@ export const holdPage = () => {`
`37`	`37`
`38`	`38`	`if(safeDocument){`
`39`	`39`	`constel=safeDocument.getElementById('body')`
`40`		`-//el.style.overflowY = 'hidden'`
`41`		`-el.style.position='fixed'`
	`40`	`+el.style.overflowY='hidden'`
	`41`	`+/el.style.position = 'fixed' /`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`@@ -47,8 +47,8 @@ export const unholdPage = () => {`
`47`	`47`
`48`	`48`	`if(safeDocument){`
`49`	`49`	`constel=safeDocument.getElementById('body')`
`50`		`-/el.style.overflowY = 'auto' /`
`51`		`-el.style.position=''`
	`50`	`+el.style.overflowY='auto'`
	`51`	`+/el.style.position = '' /`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`

Comments

(0)