fix directive rawName generation for raw render functions (fix #3930)

yyx990803 · yyx990803 · commit ff178ccc7eb9 · 2016-10-13T03:18:21.000-04:00
diff --git a/src/core/vdom/modules/directives.js b/src/core/vdom/modules/directives.js
@@ -90,23 +90,17 @@ function normalizeDirectives (
   let i, dir
   for (i = 0; i < dirs.length; i++) {
     dir = dirs[i]
-    res[getRawDirName(dir)] = dir
     if (!dir.modifiers) {
       dir.modifiers = emptyModifiers
     }
+    res[getRawDirName(dir)] = dir
     dir.def = resolveAsset(vm.$options, 'directives', dir.name, true)
   }
   return res
 }
 
 function getRawDirName (dir: VNodeDirective): string {
-  return dir.rawName || (
-    dir.name + (
-      dir.modifiers
-        ? '.' + Object.keys(dir.modifiers).join('.')
-        : ''
-    )
-  )
+  return dir.rawName || `${dir.name}.${Object.keys(dir.modifiers || {}).join('.')}`
 }
 
 function callHook (dir, hook, vnode, oldVnode) {

Original file line number	Diff line number	Diff line change
`@@ -90,23 +90,17 @@ function normalizeDirectives (`
`90`	`90`	`let i, dir`
`91`	`91`	`for (i = 0; i < dirs.length; i++) {`
`92`	`92`	`dir = dirs[i]`
`93`		`- res[getRawDirName(dir)] = dir`
`94`	`93`	`if (!dir.modifiers) {`
`95`	`94`	`dir.modifiers = emptyModifiers`
`96`	`95`	`}`
	`96`	`+ res[getRawDirName(dir)] = dir`
`97`	`97`	`dir.def = resolveAsset(vm.$options, 'directives', dir.name, true)`
`98`	`98`	`}`
`99`	`99`	`return res`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`function getRawDirName (dir: VNodeDirective): string {`
`103`		`- return dir.rawName \|\| (`
`104`		`- dir.name + (`
`105`		`- dir.modifiers`
`106`		`- ? '.' + Object.keys(dir.modifiers).join('.')`
`107`		`- : ''`
`108`		`- )`
`109`		`- )`
	`103`	+ return dir.rawName \|\| `${dir.name}.${Object.keys(dir.modifiers \|\| {}).join('.')}`
`110`	`104`	`}`
`111`	`105`
`112`	`106`	`function callHook (dir, hook, vnode, oldVnode) {`