Skip to content

Commit b36397b

Browse files
committed
use new modifier syntax
1 parent 5574af3 commit b36397b

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

src/compiler/compile-props.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ module.exports = function compileProps (el, propOptions) {
5757

5858
// then check dynamic version
5959
if ((value = _.getBindAttr(el, attr)) === null) {
60-
if ((value = _.getBindAttr(el, attr + '&')) !== null) {
60+
if ((value = _.getBindAttr(el, attr + '.sync')) !== null) {
6161
prop.mode = propBindingModes.TWO_WAY
62-
} else if ((value = _.getBindAttr(el, attr + '*')) !== null) {
62+
} else if ((value = _.getBindAttr(el, attr + '.once')) !== null) {
6363
prop.mode = propBindingModes.ONE_TIME
6464
}
6565
}

src/compiler/compile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ var resolveAsset = _.resolveAsset
1010
// special binding prefixes
1111
var bindRE = /^v-bind:|^:/
1212
var onRE = /^v-on:|^@/
13-
var literalRE = /#$/
13+
var literalRE = /\.literal$/
1414
var argRE = /:(.*)$/
1515
var transitionRE = /^(v-bind:|:)?transition$/
1616

src/compiler/transclude.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var _ = require('../util')
22
var templateParser = require('../parsers/template')
3-
var specialCharRE = /[#@\*\$\.]/
3+
var specialCharRE = /[^a-zA-Z_\-:\.]/
44

55
/**
66
* Process an element or a DocumentFragment based on a

src/directives/public/on.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ module.exports = {
4141
bind: function () {
4242
// 1.0.0 key filter
4343
var rawEvent = this.event = this.arg
44-
var keyIndex = rawEvent.indexOf(':')
44+
var keyIndex = rawEvent.indexOf('.')
4545
if (keyIndex > -1) {
4646
this.event = rawEvent.slice(0, keyIndex)
4747
this.key = rawEvent.slice(keyIndex + 1)

test/unit/specs/compiler/compile_spec.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ if (_.inBrowser) {
5050

5151
it('normal directives', function () {
5252
el.setAttribute('v-a', 'b')
53-
el.innerHTML = '<p v-a:hello="a" v-b="1">hello</p><div v-b#="hi"></div>'
53+
el.innerHTML = '<p v-a:hello="a" v-b="1">hello</p><div v-b.literal="hi"></div>'
5454
var defA = { priority: 1 }
5555
var defB = { priority: 2 }
5656
var options = _.mergeOptions(Vue.options, {
@@ -230,9 +230,9 @@ if (_.inBrowser) {
230230
'v-bind:test-normal="a" ' +
231231
'test-literal="1" ' +
232232
':optimize-literal="1" ' +
233-
':test-two-way&="a" ' +
234-
':two-way-warn&="a + 1" ' +
235-
':test-one-time*="a"></div>'
233+
':test-two-way.sync="a" ' +
234+
':two-way-warn.sync="a + 1" ' +
235+
':test-one-time.once="a"></div>'
236236
compiler.compileAndLinkProps(vm, el.firstChild, props)
237237
expect(vm._bindDir.calls.count()).toBe(3) // skip literal and one time
238238
// literal

test/unit/specs/directives/internal/prop_spec.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ if (_.inBrowser) {
7373
a: 'A'
7474
}
7575
},
76-
template: '<test v-bind:testt&="test" :bb&="b" :a&=" test.a " v-ref:child></test>',
76+
template: '<test v-bind:testt.sync="test" :bb.sync="b" :a.sync=" test.a " v-ref:child></test>',
7777
components: {
7878
test: {
7979
props: ['testt', 'bb', 'a'],
@@ -123,7 +123,7 @@ if (_.inBrowser) {
123123
data: {
124124
b: 'B'
125125
},
126-
template: '<test :b*="b" v-ref:child></test>',
126+
template: '<test :b.once="b" v-ref:child></test>',
127127
components: {
128128
test: {
129129
props: ['b'],
@@ -145,7 +145,7 @@ if (_.inBrowser) {
145145
data: {
146146
b: 'B'
147147
},
148-
template: '<test :b&=" b + \'B\'" v-ref:child></test>',
148+
template: '<test :b.sync=" b + \'B\'" v-ref:child></test>',
149149
components: {
150150
test: {
151151
props: ['b'],
@@ -248,7 +248,7 @@ if (_.inBrowser) {
248248
a: 'A',
249249
b: 'B'
250250
},
251-
template: '<test :aa&="a" :bb="b"></test>',
251+
template: '<test :aa.sync="a" :bb="b"></test>',
252252
components: {
253253
test: {
254254
props: ['aa', 'bb'],

test/unit/specs/directives/public/on_spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ if (_.inBrowser) {
7171
it('with key filter', function (done) {
7272
new Vue({
7373
el: el,
74-
template: '<a v-on:keyup:enter="test">{{a}}</a>',
74+
template: '<a v-on:keyup.enter="test">{{a}}</a>',
7575
data: {a: 1},
7676
methods: {
7777
test: function () {
@@ -92,7 +92,7 @@ if (_.inBrowser) {
9292
it('with key filter (keycode)', function (done) {
9393
new Vue({
9494
el: el,
95-
template: '<a v-on:keyup:13="test">{{a}}</a>',
95+
template: '<a v-on:keyup.13="test">{{a}}</a>',
9696
data: {a: 1},
9797
methods: {
9898
test: function () {

0 commit comments

Comments
 (0)