Commit2268c51

committed

fix tests

1 parentaacf90a commit2268c51Copy full SHA for 2268c51

File tree

+21

-23

lines changed

+21

-23

lines changed

Lines changed: 19 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,7 @@ import {`
`16`	`16`	`def,`
`17`	`17`	`cancellable,`
`18`	`18`	`isArray,`
`19`		`-isPlainObject,`
`20`		`-findVmFromFrag`
	`19`	`+isPlainObject`
`21`	`20`	`}from'../../util/index'`
`22`	`21`
`23`	`22`	`letuid=0`
`@@ -658,4 +657,22 @@ if (process.env.NODE_ENV !== 'production') {`
`658`	`657`	`}`
`659`	`658`	`}`
`660`	`659`
	`660`	`+/**`
	`661`	`+ * Find a vm from a fragment.`
	`662`	`+ *`
	`663`	`+ *@param {Fragment} frag`
	`664`	`+ *@return {Vue\|undefined}`
	`665`	`+ */`
	`666`	`+`
	`667`	`+functionfindVmFromFrag(frag){`
	`668`	`+letnode=frag.node`
	`669`	`+// handle multi-node frag`
	`670`	`+if(frag.end){`
	`671`	`+while(!node.__vue__&&node!==frag.end&&node.nextSibling){`
	`672`	`+node=node.nextSibling`
	`673`	`+}`
	`674`	`+}`
	`675`	`+returnnode.__vue__`
	`676`	`+}`
	`677`	`+`
`661`	`678`	`exportdefaultvFor`

Lines changed: 1 addition & 2 deletions

Lines changed: 0 additions & 18 deletions

Original file line number	Diff line number	Diff line change
`@@ -449,21 +449,3 @@ export function getOuterHTML (el) {`
`449`	`449`	`returncontainer.innerHTML`
`450`	`450`	`}`
`451`	`451`	`}`
`452`		`-`
`453`		`-/**`
`454`		`- * Find a vm from a fragment.`
`455`		`- *`
`456`		`- *@param {Fragment} frag`
`457`		`- *@return {Vue\|undefined}`
`458`		`- */`
`459`		`-`
`460`		`-exportfunctionfindVmFromFrag(frag){`
`461`		`-letnode=frag.node`
`462`		`-// handle multi-node frag`
`463`		`-if(frag.end){`
`464`		`-while(!node.__vue__&&node!==frag.end&&node.nextSibling){`
`465`		`-node=node.nextSibling`
`466`		`-}`
`467`		`-}`
`468`		`-returnnode.__vue__`
`469`		`-}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1002,7 +1002,7 @@ describe('v-for', function () {`
`1002`	`1002`	`expect('Frozen v-for objects cannot be automatically tracked').toHaveBeenWarned()`
`1003`	`1003`	`})`
`1004`	`1004`
`1005`		`-it('warn v-if and v-for mixed usage',()=>{`
	`1005`	`+it('warn v-if and v-for mixed usage',function(){`
`1006`	`1006`	`newVue({`
`1007`	`1007`	`el:document.createElement('div'),`
`1008`	`1008`	`template:'<div v-for="item in items" v-if="ok"></div>',`

Comments

(0)