fix vuejs#2366 custom terminal directive with global mixin

rhyzx · rhyzx · commit 97b82f8033f7 · 2016-02-20T10:09:36.000+08:00
diff --git a/src/compiler/compile.js b/src/compiler/compile.js
@@ -627,7 +627,8 @@ function makeTerminalNodeLinkFn (el, dirName, value, options, def) {
     filters: parsed.filters,
     raw: value,
     // either an element directive, or if/for
-    def: def || publicDirectives[dirName]
+    // #2366 or custom terminal directive
+    def: def || resolveAsset(options, 'directives', dirName)
   }
   // check ref for v-for and router-view
   if (dirName === 'for' || dirName === 'router-view') {
diff --git a/test/unit/specs/compiler/compile_spec.js b/test/unit/specs/compiler/compile_spec.js
@@ -636,7 +636,7 @@ describe('Compile', function () {
   })
 
   it('allow custom terminal directive', function () {
-    Vue.mixin({})
+    Vue.mixin({}) // #2366 conflict with custom terminal directive
     Vue.compiler.terminalDirectives.push('foo')
     Vue.directive('foo', {})
 
