syntax update per #1308

Author: yyx990803

src/compiler/compile.js

@@ -9,8 +9,9 @@ var resolveAsset = _.resolveAsset
 var componentDef = require('../directives/component')
 
 // special binding prefixes
-var bindRE = /^bind-|^:/
-var onRE = /^on-/
+var bindRE = /^:/
+var onRE = /^@/
+var argRE = /:(.*)$/
 var nodeRefRE = /^\$\$\./
 
 // terminal directives
@@ -547,29 +548,26 @@ function compileDirectives (attrs, options) {
     value = attr.value
     // Core directive
     if (name.indexOf(config.prefix) === 0) {
-      dirName = name.slice(config.prefix.length)
-
       // check literal
-      if (dirName.charAt(dirName.length - 1) === '#') {
+      if (name.charAt(name.length - 1) === '#') {
         isLiteral = true
-        dirName = dirName.slice(0, -1)
+        name = name.slice(0, -1)
       } else {
         isLiteral = false
       }
-
+      // check argument
+      arg = (arg = name.match(argRE)) && arg[1]
+      // extract directive name
+      dirName = name
+        .slice(config.prefix.length)
+        .replace(argRE, '')
       dirDef = resolveAsset(options, 'directives', dirName)
       if (process.env.NODE_ENV !== 'production') {
         _.assertAsset(dirDef, 'directive', dirName)
 
         // deprecations
         if (dirName === 'transition') {
           _.deprecation.V_TRANSITION()
-        } else if (dirName === 'class') {
-          _.deprecation.V_CLASS()
-        } else if (dirName === 'style') {
-          _.deprecation.V_STYLE()
-        } else if (dirName === 'on') {
-          _.deprecation.V_ON()
         } else if (dirName === 'attr') {
           _.deprecation.V_ATTR()
         } else if (dirName === 'el') {
@@ -582,6 +580,7 @@ function compileDirectives (attrs, options) {
           name: dirName,
           descriptors: dirParser.parse(value),
           def: dirDef,
+          arg: arg,
           literal: isLiteral
         })
       }

src/deprecations.js

@@ -68,8 +68,8 @@ if (process.env.NODE_ENV !== 'production') {
 
     DIR_ARGS: function (exp) {
       warn(
-        'Directives will no longer take arguments in 1.0.0. Found in directive ' +
-        '"' + exp + '"' + newBindingSyntaxLink
+        exp + ': Directive arguments will be moved into the attribute name in 1.0.0 - ' +
+        'use v-dirname:arg="expression" syntax instead.' + newBindingSyntaxLink
       )
     },
 
@@ -95,31 +95,10 @@ if (process.env.NODE_ENV !== 'production') {
       )
     },
 
-    V_CLASS: function () {
-      warn(
-        'v-class will no longer be a directive in 1.0.0; Use "bind-class" instead.' +
-        newBindingSyntaxLink
-      )
-    },
-
-    V_STYLE: function () {
-      warn(
-        'v-style will no longer be a directive in 1.0.0; Use "bind-style" instead.' +
-        newBindingSyntaxLink
-      )
-    },
-
     V_ATTR: function () {
       warn(
-        'v-attr will no longer be a directive in 1.0.0; Use the "bind-" syntax instead.' +
-        newBindingSyntaxLink
-      )
-    },
-
-    V_ON: function () {
-      warn(
-        'v-on will no longer be a directive in 1.0.0; Use the "on-" syntax instead.' +
-        newBindingSyntaxLink
+        'v-attr will be renamed to v-bind in 1.0.0. Also, use v-bind:attr="expression" ' +
+        'syntax instead.' + newBindingSyntaxLink
       )
     },
 

src/directives/index.js

@@ -25,3 +25,6 @@ exports['if'] = require('./if')
 // but we still want to expose them for advanced usage.
 exports._component = require('./component')
 exports._prop = require('./prop')
+
+// 1.0.0 compat
+exports.bind = exports.attr

src/directives/on.js

@@ -9,7 +9,7 @@ module.exports = {
   bind: function () {
     // 1.0.0 key filter
     var rawArg = this.arg
-    var keyIndex = rawArg.indexOf('-')
+    var keyIndex = rawArg.indexOf(':')
     if (keyIndex > -1) {
       this.arg = rawArg.slice(0, keyIndex)
       this.key = rawArg.slice(keyIndex + 1)