Skip to content

Commit 5b9759c

Browse files
committed
remove config.prefix
1 parent 8453e9f commit 5b9759c

File tree

7 files changed

+10
-36
lines changed

7 files changed

+10
-36
lines changed

src/compiler/compile.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ var _ = require('../util')
22
var publicDirectives = require('../directives/public')
33
var internalDirectives = require('../directives/internal')
44
var compileProps = require('./compile-props')
5-
var config = require('../config')
65
var textParser = require('../parsers/text')
76
var dirParser = require('../parsers/directive')
87
var templateParser = require('../parsers/template')
@@ -490,7 +489,7 @@ function checkComponent (el, options) {
490489

491490
function checkTerminalDirectives (el, options) {
492491
if (_.attr(el, 'pre') !== null ||
493-
el.hasAttribute(config.prefix + 'else')) {
492+
el.hasAttribute('v-else')) {
494493
return skip
495494
}
496495
var value, dirName
@@ -552,8 +551,8 @@ function compileDirectives (attrs, options) {
552551
name = attr.name
553552
value = attr.value
554553
// Core directive
555-
if (name.indexOf(config.prefix) === 0) {
556-
dirName = name.slice(config.prefix.length)
554+
if (name.indexOf('v-') === 0) {
555+
dirName = name.slice(2)
557556

558557
// check literal
559558
if (dirName.charAt(dirName.length - 1) === '#') {

src/compiler/transclude.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
var _ = require('../util')
2-
var config = require('../config')
32
var templateParser = require('../parsers/template')
43
var specialCharRE = /[#@\*\$\.]/
54

@@ -89,9 +88,9 @@ function transcludeTemplate (el, options) {
8988
// element directive
9089
_.resolveAsset(options, 'elementDirectives', tag) ||
9190
// for block
92-
replacer.hasAttribute(config.prefix + 'for') ||
91+
replacer.hasAttribute('v-for') ||
9392
// if block
94-
replacer.hasAttribute(config.prefix + 'if')
93+
replacer.hasAttribute('v-if')
9594
) {
9695
return frag
9796
} else {

src/config.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
module.exports = {
22

3-
/**
4-
* The prefix to look for when parsing directives.
5-
*
6-
* @type {String}
7-
*/
8-
9-
prefix: 'v-',
10-
113
/**
124
* Whether to print debug messages.
135
* Also enables stack trace for warnings.

src/directive.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
var _ = require('./util')
2-
var config = require('./config')
32
var Watcher = require('./watcher')
43
var expParser = require('./parsers/expression')
54

@@ -63,7 +62,7 @@ Directive.prototype._bind = function () {
6362
(name !== 'cloak' || this.vm._isCompiled) &&
6463
this.el && this.el.removeAttribute
6564
) {
66-
var attr = descriptor.attr || (config.prefix + name)
65+
var attr = descriptor.attr || ('v-' + name)
6766
this.el.removeAttribute(attr)
6867
}
6968

src/directives/element/slot.js

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
var _ = require('../../util')
2-
var config = require('../../config')
32
var templateParser = require('../../parsers/template')
43

54
// This is the elementDirective that handles <content>
@@ -113,23 +112,11 @@ function extractFragment (nodes, parent, main) {
113112

114113
function append (node) {
115114
if (_.isTemplate(node) &&
116-
!hasDirecitve(node, 'if') &&
117-
!hasDirecitve(node, 'for')) {
115+
!node.hasAttribute('v-if') &&
116+
!node.hasAttribute('v-for')) {
118117
node = templateParser.parse(node)
119118
}
120119
node = templateParser.clone(node)
121120
frag.appendChild(node)
122121
}
123122
}
124-
125-
/**
126-
* Check if there is a flow control directive on a template
127-
* element that is a slot.
128-
*
129-
* @param {Node} node
130-
* @param {String} dir
131-
*/
132-
133-
function hasDirecitve (node, dir) {
134-
return node.hasAttribute(config.prefix + dir)
135-
}

src/directives/public/cloak.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
var config = require('../../config')
2-
31
module.exports = {
42
bind: function () {
53
var el = this.el
64
this.vm.$once('hook:compiled', function () {
7-
el.removeAttribute(config.prefix + 'cloak')
5+
el.removeAttribute('v-cloak')
86
})
97
}
108
}

src/util/dom.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ exports.inDoc = function (node) {
4949
*/
5050

5151
exports.attr = function (node, attr) {
52-
attr = config.prefix + attr
52+
attr = 'v-' + attr
5353
var val = node.getAttribute(attr)
5454
if (val !== null) {
5555
node.removeAttribute(attr)

0 commit comments

Comments
 (0)