Commiteca73f2

authored and

committed

fix directive sort compare (vuejs#3776)

* fix directive sort compare* fix directive sort compare. and update normal directives test case.

1 parent64f7113 commiteca73f2Copy full SHA for eca73f2

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -122,18 +122,20 @@ function sortDirectives (dirs) {`
`122`	`122`
`123`	`123`	`vargroupedMap={}`
`124`	`124`	`vari,j,k,l`
	`125`	`+varindex=0`
	`126`	`+varpriorities=[]`
`125`	`127`	`for(i=0,j=dirs.length;i<j;i++){`
`126`	`128`	`vardir=dirs[i]`
`127`	`129`	`varpriority=dir.descriptor.def.priority\|\|DEFAULT_PRIORITY`
`128`	`130`	`vararray=groupedMap[priority]`
`129`	`131`	`if(!array){`
`130`	`132`	`array=groupedMap[priority]=[]`
	`133`	`+priorities.push(priority)`
`131`	`134`	`}`
`132`	`135`	`array.push(dir)`
`133`	`136`	`}`
`134`	`137`
`135`		`-varindex=0`
`136`		`-varpriorities=Object.keys(groupedMap).sort(function(a,b){`
	`138`	`+priorities.sort(function(a,b){`
`137`	`139`	`returna>b ?-1 :a===b ?0 :1`
`138`	`140`	`})`
`139`	`141`	`for(i=0,j=priorities.length;i<j;i++){`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,8 @@ describe('Compile', function () {`
`53`	`53`	`it('normal directives',function(){`
`54`	`54`	`el.setAttribute('v-a','b')`
`55`	`55`	`el.innerHTML='<p v-a:hello.a.b="a" v-b="1">hello</p><div v-b.literal="foo"></div>'`
`56`		`-vardefA={priority:1}`
`57`		`-vardefB={priority:2}`
	`56`	`+vardefA={priority:250}`
	`57`	`+vardefB={priority:1100}`
`58`	`58`	`varoptions=_.mergeOptions(Vue.options,{`
`59`	`59`	`directives:{`
`60`	`60`	`a:defA,`

Comments

(0)