Skip to content

Commit d61d80f

Browse files
authored
Merge branch 'dev' into fix-b-table-reactivity-issues
2 parents 2ea7770 + 2f7d3c8 commit d61d80f

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
"@nuxtjs/robots": "^2.4.2",
112112
"@nuxtjs/sitemap": "^2.4.0",
113113
"@testing-library/jest-dom": "^5.11.4",
114-
"@vue/test-utils": "^1.0.5",
114+
"@vue/test-utils": "^1.1.0",
115115
"autoprefixer": "^9.8.6",
116116
"babel-core": "^7.0.0-bridge.0",
117117
"babel-eslint": "^10.1.0",

src/mixins/pagination.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -528,9 +528,9 @@ export default {
528528
: `${this.labelPage} ${page.number}`,
529529
'aria-checked': isNav ? null : active ? 'true' : 'false',
530530
'aria-current': isNav && active ? 'page' : null,
531-
'aria-posinset': page.number,
532-
'aria-setsize': numberOfPages,
533-
// ARIA "roving tabindex" method (except in isNav mode)
531+
'aria-posinset': isNav ? null : page.number,
532+
'aria-setsize': isNav ? null : numberOfPages,
533+
// ARIA "roving tabindex" method (except in `isNav` mode)
534534
tabindex: isNav ? null : tabIndex
535535
}
536536
const btnContent = toString(this.makePage(page.number))

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2176,10 +2176,10 @@
21762176
optionalDependencies:
21772177
prettier "^1.18.2"
21782178

2179-
"@vue/test-utils@^1.0.5":
2180-
version "1.0.5"
2181-
resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.0.5.tgz#676e1f986bb93ddc869d9c6cf1c820183d64d92f"
2182-
integrity sha512-P2x8kXwqfTXesAdfJQN146V1S3QD3Xv9wYZ1B09Oecmg7I3Fpqqo1CwfIn5ivwuXyBPQWFDH4vyBHynnYjIkRg==
2179+
"@vue/test-utils@^1.1.0":
2180+
version "1.1.0"
2181+
resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.1.0.tgz#76305e73a786c921ede1352849614e26c7113f94"
2182+
integrity sha512-M+3jtVqNYIrvzO5gaxogre5a5+96h0hN/dXw+5Lj0t+dp6fAhYcUjpLrC9j9cEEkl2Rcuh/gKYRUmR5N4vcqPw==
21832183
dependencies:
21842184
dom-event-types "^1.0.0"
21852185
lodash "^4.17.15"

0 commit comments

Comments
 (0)