Evan You 10 лет назад
Родитель
Сommit
5b9759c185

+ 3 - 4
src/compiler/compile.js

@@ -2,7 +2,6 @@ var _ = require('../util')
 var publicDirectives = require('../directives/public')
 var internalDirectives = require('../directives/internal')
 var compileProps = require('./compile-props')
-var config = require('../config')
 var textParser = require('../parsers/text')
 var dirParser = require('../parsers/directive')
 var templateParser = require('../parsers/template')
@@ -490,7 +489,7 @@ function checkComponent (el, options) {
 
 function checkTerminalDirectives (el, options) {
   if (_.attr(el, 'pre') !== null ||
-      el.hasAttribute(config.prefix + 'else')) {
+      el.hasAttribute('v-else')) {
     return skip
   }
   var value, dirName
@@ -552,8 +551,8 @@ function compileDirectives (attrs, options) {
     name = attr.name
     value = attr.value
     // Core directive
-    if (name.indexOf(config.prefix) === 0) {
-      dirName = name.slice(config.prefix.length)
+    if (name.indexOf('v-') === 0) {
+      dirName = name.slice(2)
 
       // check literal
       if (dirName.charAt(dirName.length - 1) === '#') {

+ 2 - 3
src/compiler/transclude.js

@@ -1,5 +1,4 @@
 var _ = require('../util')
-var config = require('../config')
 var templateParser = require('../parsers/template')
 var specialCharRE = /[#@\*\$\.]/
 
@@ -89,9 +88,9 @@ function transcludeTemplate (el, options) {
         // element directive
         _.resolveAsset(options, 'elementDirectives', tag) ||
         // for block
-        replacer.hasAttribute(config.prefix + 'for') ||
+        replacer.hasAttribute('v-for') ||
         // if block
-        replacer.hasAttribute(config.prefix + 'if')
+        replacer.hasAttribute('v-if')
       ) {
         return frag
       } else {

+ 0 - 8
src/config.js

@@ -1,13 +1,5 @@
 module.exports = {
 
-  /**
-   * The prefix to look for when parsing directives.
-   *
-   * @type {String}
-   */
-
-  prefix: 'v-',
-
   /**
    * Whether to print debug messages.
    * Also enables stack trace for warnings.

+ 1 - 2
src/directive.js

@@ -1,5 +1,4 @@
 var _ = require('./util')
-var config = require('./config')
 var Watcher = require('./watcher')
 var expParser = require('./parsers/expression')
 
@@ -63,7 +62,7 @@ Directive.prototype._bind = function () {
     (name !== 'cloak' || this.vm._isCompiled) &&
     this.el && this.el.removeAttribute
   ) {
-    var attr = descriptor.attr || (config.prefix + name)
+    var attr = descriptor.attr || ('v-' + name)
     this.el.removeAttribute(attr)
   }
 

+ 2 - 15
src/directives/element/slot.js

@@ -1,5 +1,4 @@
 var _ = require('../../util')
-var config = require('../../config')
 var templateParser = require('../../parsers/template')
 
 // This is the elementDirective that handles <content>
@@ -113,23 +112,11 @@ function extractFragment (nodes, parent, main) {
 
   function append (node) {
     if (_.isTemplate(node) &&
-        !hasDirecitve(node, 'if') &&
-        !hasDirecitve(node, 'for')) {
+        !node.hasAttribute('v-if') &&
+        !node.hasAttribute('v-for')) {
       node = templateParser.parse(node)
     }
     node = templateParser.clone(node)
     frag.appendChild(node)
   }
 }
-
-/**
- * Check if there is a flow control directive on a template
- * element that is a slot.
- *
- * @param {Node} node
- * @param {String} dir
- */
-
-function hasDirecitve (node, dir) {
-  return node.hasAttribute(config.prefix + dir)
-}

+ 1 - 3
src/directives/public/cloak.js

@@ -1,10 +1,8 @@
-var config = require('../../config')
-
 module.exports = {
   bind: function () {
     var el = this.el
     this.vm.$once('hook:compiled', function () {
-      el.removeAttribute(config.prefix + 'cloak')
+      el.removeAttribute('v-cloak')
     })
   }
 }

+ 1 - 1
src/util/dom.js

@@ -49,7 +49,7 @@ exports.inDoc = function (node) {
  */
 
 exports.attr = function (node, attr) {
-  attr = config.prefix + attr
+  attr = 'v-' + attr
   var val = node.getAttribute(attr)
   if (val !== null) {
     node.removeAttribute(attr)