Skip to content

Commit a4a92e2

Browse files
committed
Merge branch 'master' into dev
2 parents ae51c07 + f88aa14 commit a4a92e2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+260
-108
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ jobs:
106106
download_language: eo
107107
localization_branch_name: ${{ env.LOCAL_BRANCH }}
108108
crowdin_branch_name: ${{ env.CROWDIN_BRANCH }}
109+
debug_mode: true
109110

110111
- name: Download ja
111112
uses: crowdin/[email protected]
@@ -118,6 +119,7 @@ jobs:
118119
download_language: ja
119120
localization_branch_name: ${{ env.LOCAL_BRANCH }}
120121
crowdin_branch_name: ${{ env.CROWDIN_BRANCH }}
122+
debug_mode: true
121123

122124
- name: Download zh-CN
123125
uses: crowdin/[email protected]
@@ -130,6 +132,7 @@ jobs:
130132
download_language: zh-CN
131133
localization_branch_name: ${{ env.LOCAL_BRANCH }}
132134
crowdin_branch_name: ${{ env.CROWDIN_BRANCH }}
135+
debug_mode: true
133136

134137
- run: yarn run build:modified
135138
working-directory: ./packages/docs

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
}
1414
},
1515
"npmClient": "yarn",
16-
"version": "2.4.8",
16+
"version": "2.4.11",
1717
"useWorkspaces": true
1818
}

packages/api-generator/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vuetify/api-generator",
3-
"version": "2.4.8",
3+
"version": "2.4.11",
44
"private": true,
55
"description": "",
66
"main": "src/index.js",
@@ -17,7 +17,7 @@
1717
"deepmerge": "^4.0.0",
1818
"rimraf": "^3.0.2",
1919
"vue": "^2.6.11",
20-
"vuetify": "^2.4.8"
20+
"vuetify": "^2.4.11"
2121
},
2222
"devDependencies": {
2323
"@babel/node": "^7.5.5",

packages/api-generator/src/locale/en/generic.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"falseValue": "Sets value for falsy state",
77
"fullWidth": "Forces 100% width",
88
"id": "Sets the DOM id on the component",
9-
"persistent": "Clicking outside will not dismiss the dialog",
9+
"persistent": "Clicking outside or pressing **esc** key will not dismiss the dialog",
1010
"size": "Sets the height and width of the component.",
1111
"tag": "Specify a custom tag used on the root element.",
1212
"textColor": "Applies a specified color to the control text",

packages/api-generator/src/locale/en/v-data-footer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
},
1717
"slots": {
1818
"prepend": "Adds content to the empty space in the footer",
19-
"pageText": "Defines content for the items-per-page text"
19+
"page-text": "Defines content for the items-per-page text"
2020
},
2121
"events": {
2222
"update:options": "The `.sync` event for `options` prop"

packages/api-generator/src/locale/en/v-dialog.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"noClickAnimation": "Disables the bounce effect when clicking outside of a `v-dialog`'s content when using the **persistent** prop.",
1010
"openOnHover": "Designates whether component should activate when its activator is hovered.",
1111
"origin": "Sets the transition origin on the element. You can find more information on the MDN documentation [for transition origin](https://developer.mozilla.org/en-US/docs/Web/CSS/transform-origin).",
12-
"persistent": "Clicking outside of the element will not deactivate it.",
12+
"persistent": "Clicking outside of the element or pressing **esc** key will not deactivate it.",
1313
"retainFocus": "Tab focus will return to the first child of the dialog by default. Disable this when using external tools that require focus such as TinyMCE or vue-clipboard.",
1414
"scrollable": "When set to true, expects a `v-card` and a `v-card-text` component with a designated height. For more information, check out the [scrollable example](/components/dialogs#scrollable).",
1515
"transition": "Sets the component transition. Can be one of the [built in transitions](/styles/transitions) or one your own."

packages/api-generator/src/locale/en/v-slide-group.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
},
1313
"events": {
1414
"change": "Emitted when the component value is changed by user interaction",
15-
"click:location": "Emitted when a slide item is selected inside of the slide group"
15+
"click:prev": "Emitted when the prev is clicked",
16+
"click:next": "Emitted when the next is clicked"
1617
}
1718
}

packages/api-generator/src/maps/v-menu.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,11 @@ module.exports = {
1414
},
1515
},
1616
],
17+
events: [
18+
{
19+
name: 'input',
20+
value: 'boolean',
21+
},
22+
],
1723
},
1824
}

packages/api-generator/src/maps/v-slide-group.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ module.exports = {
66
value: 'any[] | any',
77
},
88
{
9-
name: 'click:location',
9+
name: 'click:prev',
10+
value: 'void',
11+
},
12+
{
13+
name: 'click:next',
1014
value: 'void',
1115
},
1216
],

packages/docs/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "A Vue.js project",
44
"private": true,
55
"author": "John Leider <[email protected]>",
6-
"version": "2.4.8",
6+
"version": "2.4.11",
77
"repository": {
88
"type": "git",
99
"url": "git+https://github.com/vuetifyjs/vuetify.git",
@@ -31,7 +31,7 @@
3131
"vue-i18n": "^8.17.7",
3232
"vue-instantsearch": "^3.4.3",
3333
"vue-router": "^3.1.6",
34-
"vuetify": "^2.4.8",
34+
"vuetify": "^2.4.11",
3535
"vuex": "^3.4.0",
3636
"webpack-node-externals": "^2.5.1"
3737
},
@@ -42,7 +42,7 @@
4242
"@vue/cli-plugin-router": "~4.5.3",
4343
"@vue/cli-plugin-vuex": "~4.5.3",
4444
"@vue/cli-service": "~4.5.3",
45-
"@vuetify/api-generator": "^2.4.8",
45+
"@vuetify/api-generator": "^2.4.11",
4646
"@vuetify/vue-cli-plugin-base": "~0.3.5",
4747
"cosmicjs": "^3.2.43",
4848
"date-fns": "^2.14.0",

0 commit comments

Comments
 (0)