Skip to content

Commit

Permalink
Merge pull request #2594 from nextcloud/dependencies/eslint-config
Browse files Browse the repository at this point in the history
  • Loading branch information
skjnldsv authored Apr 8, 2022
2 parents 46810c0 + d8a0820 commit 782b31d
Show file tree
Hide file tree
Showing 130 changed files with 1,669 additions and 1,529 deletions.
2,348 changes: 1,204 additions & 1,144 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"@fontsource/roboto": "^4.5.5",
"@nextcloud/babel-config": "^1.0.0",
"@nextcloud/browserslist-config": "^2.1.0",
"@nextcloud/eslint-config": "^5.1.0",
"@nextcloud/eslint-config": "^7.0.2",
"@nextcloud/stylelint-config": "^1.0.0-beta.0",
"@vue/test-utils": "^1.0.4",
"@vue/vue2-jest": "^27.0.0-alpha.4",
Expand All @@ -87,10 +87,8 @@
"css-loader": "^5.0.0",
"cypress": "^9.5.3",
"cypress-visual-regression": "^1.5.0",
"eslint": "^7.21.0",
"eslint-loader": "^4.0.2",
"eslint-plugin-cypress": "^2.11.1",
"eslint-plugin-import": "^2.23.4",
"eslint-webpack-plugin": "^3.1.1",
"file-loader": "^6.0.0",
"gettext-extractor": "^3.5.2",
"gettext-parser": "^5.0.0",
Expand Down
8 changes: 4 additions & 4 deletions src/components/ActionButton/ActionButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@ export default {

<template>
<li class="action" :class="{ 'action--disabled': disabled }">
<button
class="action-button"
<button class="action-button"
:class="{ focusable: isFocusable }"
:aria-label="ariaLabel"
type="button"
Expand Down Expand Up @@ -127,7 +126,7 @@ import ActionTextMixin from '../../mixins/actionText'
/**
* Button component to be used in Actions
*/
*/
export default {
name: 'ActionButton',
Expand All @@ -145,7 +144,8 @@ export default {
computed: {
/**
* determines if the action is focusable
* @returns {boolean} is the action focusable ?
*
* @return {boolean} is the action focusable ?
*/
isFocusable() {
return !this.disabled
Expand Down
2 changes: 1 addition & 1 deletion src/components/ActionButton/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* @author John Molakvoæ <skjnldsv@protonmail.com>
*
* @license GNU AGPL version 3 or any later version
* @license AGPL-3.0-or-later
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
Expand Down
2 changes: 1 addition & 1 deletion src/components/ActionCaption/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* @author Marco Ambrosini <marcoambrosini@pm.me>
*
* @license GNU AGPL version 3 or any later version
* @license AGPL-3.0-or-later
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
Expand Down
7 changes: 6 additions & 1 deletion src/components/ActionCheckbox/ActionCheckbox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ export default {
computed: {
/**
* determines if the action is focusable
* @returns {boolean} is the action focusable ?
*
* @return {boolean} is the action focusable ?
*/
isFocusable() {
return !this.disabled
Expand All @@ -117,25 +118,29 @@ export default {
onChange(event) {
/**
* Emitted when the checkbox state is changed
*
* @type {boolean}
*/
this.$emit('update:checked', this.$refs.checkbox.checked)
/**
* Emitted when the checkbox state is changed
*
* @type {Event}
*/
this.$emit('change', event)
if (this.$refs.checkbox.checked) {
/**
* Emitted when the checkbox is checked
*
* @type {Event}
*/
this.$emit('check')
} else {
/**
* Emitted when the checkbox is unchecked
*
* @type {Event}
*/
this.$emit('uncheck')
Expand Down
2 changes: 1 addition & 1 deletion src/components/ActionCheckbox/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* @author John Molakvoæ <skjnldsv@protonmail.com>
*
* @license GNU AGPL version 3 or any later version
* @license AGPL-3.0-or-later
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
Expand Down
7 changes: 6 additions & 1 deletion src/components/ActionInput/ActionInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,8 @@ export default {
},
/**
* determines if the action is focusable
* @returns {boolean} is the action focusable ?
*
* @return {boolean} is the action focusable ?
*/
isFocusable() {
return !this.disabled
Expand All @@ -214,12 +215,14 @@ export default {
onInput(event) {
/**
* Emitted on input events of the text field
*
* @type {Event|Date}
*/
this.$emit('input', event)
/**
* Emitted when the inputs value changes
* ! DatetimePicker only send the value
*
* @type {string|Date}
*/
this.$emit('update:value', event.target ? event.target.value : event)
Expand All @@ -230,6 +233,7 @@ export default {
if (!this.disabled) {
/**
* Emitted on submit of the input field
*
* @type {Event}
*/
this.$emit('submit', event)
Expand All @@ -241,6 +245,7 @@ export default {
onChange(event) {
/**
* Emitted on change of the input field
*
* @type {Event}
*/
this.$emit('change', event)
Expand Down
2 changes: 1 addition & 1 deletion src/components/ActionInput/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* @author John Molakvoæ <skjnldsv@protonmail.com>
*
* @license GNU AGPL version 3 or any later version
* @license AGPL-3.0-or-later
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
Expand Down
3 changes: 1 addition & 2 deletions src/components/ActionLink/ActionLink.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ This component is made to be used inside of the [Actions](#Actions) component sl

<template>
<li class="action">
<a
:download="download"
<a :download="download"
:href="href"
:aria-label="ariaLabel"
:target="target"
Expand Down
2 changes: 1 addition & 1 deletion src/components/ActionLink/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* @author John Molakvoæ <skjnldsv@protonmail.com>
*
* @license GNU AGPL version 3 or any later version
* @license AGPL-3.0-or-later
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
Expand Down
5 changes: 4 additions & 1 deletion src/components/ActionRadio/ActionRadio.vue
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ export default {
computed: {
/**
* determines if the action is focusable
* @returns {boolean} is the action focusable ?
*
* @return {boolean} is the action focusable ?
*/
isFocusable() {
return !this.disabled
Expand All @@ -130,12 +131,14 @@ export default {
onChange(event) {
/**
* Emitted when the radio state is changed
*
* @type {boolean}
*/
this.$emit('update:checked', this.$refs.radio.checked)
/**
* Emitted when the radio state is changed
*
* @type {Event}
*/
this.$emit('change', event)
Expand Down
2 changes: 1 addition & 1 deletion src/components/ActionRadio/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* @author John Molakvoæ <skjnldsv@protonmail.com>
*
* @license GNU AGPL version 3 or any later version
* @license AGPL-3.0-or-later
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
Expand Down
2 changes: 1 addition & 1 deletion src/components/ActionRouter/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* @author John Molakvoæ <skjnldsv@protonmail.com>
*
* @license GNU AGPL version 3 or any later version
* @license AGPL-3.0-or-later
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
Expand Down
2 changes: 1 addition & 1 deletion src/components/ActionSeparator/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* @author Kristof Hamann
*
* @license GNU AGPL version 3 or any later version
* @license AGPL-3.0-or-later
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
Expand Down
3 changes: 1 addition & 2 deletions src/components/ActionText/ActionText.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@
@click="onClick">
<!-- @slot Manually provide icon -->
<slot name="icon">
<span
v-if="icon !== ''"
<span v-if="icon !== ''"
:class="[isIconUrl ? 'action-text__icon--url' : icon]"
:style="{ backgroundImage: isIconUrl ? `url(${icon})` : null }"
class="action-text__icon" />
Expand Down
2 changes: 1 addition & 1 deletion src/components/ActionText/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* @author John Molakvoæ <skjnldsv@protonmail.com>
*
* @license GNU AGPL version 3 or any later version
* @license AGPL-3.0-or-later
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
Expand Down
6 changes: 5 additions & 1 deletion src/components/ActionTextEditable/ActionTextEditable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@ export default {
computed: {
/**
* determines if the action is focusable
* @returns {boolean} is the action focusable ?
*
* @return {boolean} is the action focusable ?
*/
isFocusable() {
return !this.disabled
Expand All @@ -124,11 +125,13 @@ export default {
onInput(event) {
/**
* Emitted on input events of the text field
*
* @type {Event|Date}
*/
this.$emit('input', event)
/**
* Emitted when the inputs value changes
*
* @type {string|Date}
*/
this.$emit('update:value', event.target.value)
Expand All @@ -139,6 +142,7 @@ export default {
if (!this.disabled) {
/**
* Emitted on submit of the input field
*
* @type {Event}
*/
this.$emit('submit', event)
Expand Down
2 changes: 1 addition & 1 deletion src/components/ActionTextEditable/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* @author John Molakvoæ <skjnldsv@protonmail.com>
*
* @license GNU AGPL version 3 or any later version
* @license AGPL-3.0-or-later
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
Expand Down
20 changes: 13 additions & 7 deletions src/components/Actions/Actions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,7 @@ export default {
:class="{'action-item--open': opened}"
class="action-item">
<!-- If more than one action, create a popovermenu -->
<Popover
:delay="0"
<Popover :delay="0"
:handle-resize="true"
:open.sync="opened"
:placement="placement"
Expand Down Expand Up @@ -366,23 +365,26 @@ export default {
computed: {
/**
* Is there more than one action?
* @returns {boolean}
*
* @return {boolean}
*/
hasMultipleActions() {
return this.actions.length > 1
},
/**
* Is there any first action ?
* And is it allowed as a standalone element ?
* @returns {boolean}
*
* @return {boolean}
*/
isValidSingleAction() {
return this.actions.length === 1
&& this.firstActionElement !== null
},
/**
* Return the title of the single action if forced
* @returns {string}
*
* @return {string}
*/
singleActionTitle() {
return this.forceTitle ? this.menuTitle : ''
Expand All @@ -393,14 +395,16 @@ export default {
},
/**
* First action vnode
* @returns {Object} return the first action vue vnode
*
* @return {object} return the first action vue vnode
*/
firstActionVNode() {
return this.actions[0]
},
/**
* Binding of the first action to the template
* @returns {Object} vue template v-bind shortcut
*
* @return {object} vue template v-bind shortcut
*/
firstActionBinding() {
if (this.firstActionVNode && this.firstActionVNode.componentOptions) {
Expand Down Expand Up @@ -508,6 +512,7 @@ export default {
/**
* Event emitted when the popover menu open state is changed
*
* @type {boolean}
*/
this.$emit('update:open', true)
Expand All @@ -526,6 +531,7 @@ export default {
/**
* Event emitted when the popover menu open state is changed
*
* @type {boolean}
*/
this.$emit('update:open', false)
Expand Down
2 changes: 1 addition & 1 deletion src/components/Actions/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*
* @author John Molakvoæ <skjnldsv@protonmail.com>
*
* @license GNU AGPL version 3 or any later version
* @license AGPL-3.0-or-later
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
Expand Down
3 changes: 1 addition & 2 deletions src/components/AppContent/AppContent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@ The list size must be between the min and the max width value.
</div>

<div v-else class="app-content-wrapper">
<Splitpanes
class="default-theme"
<Splitpanes class="default-theme"
@resized="handlePaneResize">
<Pane class="splitpanes__pane-list"
:size="listPaneSize || paneDefaults.list.size"
Expand Down
Loading

0 comments on commit 782b31d

Please sign in to comment.