Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit a80ea67

Browse files
committed
Fix: Resolve Conflict
1 parent 7c99102 commit a80ea67

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

‎tests/lib/rules/attributes-order.js‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -226,9 +226,9 @@ tester.run('attributes-order', rule, {
226226
is="header"
227227
v-on:click="functionCall"
228228
ref="header"
229-
:prop="headerData"
230229
v-text="textContent"
231230
id="uniqueID"
231+
:prop="headerData"
232232
myProp="prop"
233233
>
234234
</div>
@@ -242,10 +242,11 @@ tester.run('attributes-order', rule, {
242242
'DEFINITION',
243243
'EVENTS',
244244
'UNIQUE',
245-
'BINDING',
245+
'TWO_WAY_BINDING',
246246
'CONTENT',
247247
'GLOBAL',
248-
'OTHER_ATTR'
248+
'OTHER_ATTR',
249+
'OTHER_DIRECTIVES'
249250
]
250251
}]
251252
}
@@ -286,7 +287,7 @@ tester.run('attributes-order', rule, {
286287
<div
287288
v-model="toggle"
288289
model="baz"
289-
:bindingProp="foo"
290+
:id="foo"
290291
propOne="bar">
291292
</div>
292293
</template>`,
@@ -464,14 +465,15 @@ tester.run('attributes-order', rule, {
464465
{ order:
465466
[
466467
'EVENTS',
467-
'BINDING',
468+
'TWO_WAY_BINDING',
468469
'UNIQUE',
469470
'DEFINITION',
470471
'CONDITIONALS',
471472
'LIST_RENDERING',
472473
'RENDER_MODIFIERS',
473474
'GLOBAL',
474475
'OTHER_ATTR',
476+
'OTHER_DIRECTIVES',
475477
'CONTENT'
476478
]
477479
}],
@@ -504,10 +506,6 @@ tester.run('attributes-order', rule, {
504506
message: 'Attribute "ref" should go before "v-once".',
505507
nodeType: 'VIdentifier'
506508
},
507-
{
508-
message: 'Attribute ":prop" should go before "v-once".',
509-
nodeType: 'VDirectiveKey'
510-
},
511509
{
512510
message: 'Attribute "id" should go before "v-text".',
513511
nodeType: 'VIdentifier'

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /