Merge pull request #2071 from nextcloud/backport/2069/stable3

nextcloud-libraries · Jun 29, 2021 · 0c4f7e6 · 0c4f7e6
2 parents 10179e5 + 401cf06
commit 0c4f7e6
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 5 deletions.
diff --git a/src/components/ActionButton/ActionButton.vue b/src/components/ActionButton/ActionButton.vue
@@ -82,8 +82,9 @@ export default {
 	<li class="action" :class="{ 'action--disabled': disabled }">
 		<button
 			class="action-button"
-			:aria-label="ariaLabel"
 			:class="{ focusable: isFocusable }"
+			:aria-label="ariaLabel"
+			type="button"
 			@click="onClick">
 			<span :class="[isIconUrl ? 'action-button__icon--url' : icon]"
 				:style="{ backgroundImage: isIconUrl ? `url(${icon})` : null }"

diff --git a/src/components/Actions/Actions.vue b/src/components/Actions/Actions.vue
@@ -183,11 +183,12 @@ export default {
 					'action-item__menutoggle--with-title': menuTitle,
 					'action-item__menutoggle--primary': primary
 				}"
-				:aria-label="ariaLabel"
 				aria-haspopup="true"
+				:aria-label="ariaLabel"
 				:aria-controls="randomId"
-				test-attr="1"
 				:aria-expanded="opened ? 'true' : 'false'"
+				test-attr="1"
+				type="button"
 				@focus="onFocus"
 				@blur="onBlur">
 				<slot name="icon" />

diff --git a/src/components/AppNavigationItem/AppNavigationIconCollapsible.vue b/src/components/AppNavigationItem/AppNavigationIconCollapsible.vue
@@ -25,6 +25,7 @@
 	<button
 		class="icon-collapse"
 		:class="{'icon-collapse--rotated':open}"
+		type="button"
 		@click="onClick" />
 </template>
 

diff --git a/src/components/AppNavigationNew/AppNavigationNew.vue b/src/components/AppNavigationNew/AppNavigationNew.vue
@@ -24,8 +24,8 @@
 	<div class="app-navigation-new">
 		<button :id="buttonId"
 			:class="buttonClass"
-			type="button"
 			:disabled="disabled"
+			type="button"
 			@click="$emit('click')">
 			{{ text }}
 		</button>

diff --git a/src/components/AppNavigationSettings/AppNavigationSettings.vue b/src/components/AppNavigationSettings/AppNavigationSettings.vue
@@ -25,7 +25,9 @@
 		v-click-outside="clickOutsideConfig"
 		:class="{ open }">
 		<div id="app-settings-header">
-			<button class="settings-button"
+			<button
+				class="settings-button"
+				type="button"
 				@click="toggleMenu">
 				{{ title }}
 			</button>

diff --git a/src/components/ColorPicker/ColorPicker.vue b/src/components/ColorPicker/ColorPicker.vue
@@ -119,6 +119,7 @@ export default {
 						:style="{'background-color': color }"
 						class="color-picker-simple-color-circle"
 						:class="{ 'color-picker-simple-color-circle--active' : color === currentColor }"
+						type="button"
 						@click="pickColor(color)" />
 				</div>
 				<Chrome
@@ -133,14 +134,17 @@ export default {
 				<button
 					v-if="advanced"
 					class="color-picker-navigation-button back"
+					type="button"
 					@click="handleBack" />
 				<button
 					v-if="!advanced"
 					class="color-picker-navigation-button more-settings"
+					type="button"
 					@click="handleMoreSettings" />
 				<button
 					v-if="advanced"
 					class="color-picker-navigation-button confirm"
+					type="button"
 					@click="handleConfirm">
 					{{ t('Choose') }}
 				</button>

diff --git a/src/components/Modal/Modal.vue b/src/components/Modal/Modal.vue
@@ -82,6 +82,7 @@ export default {
 							v-tooltip.auto="playPauseTitle"
 							:class="{ 'play-pause--paused': slideshowPaused }"
 							class="play-pause"
+							type="button"
 							@click="togglePlayPause">
 							<!-- Progress circle, css animated -->
 							<div :class="[playing ? 'icon-pause' : 'icon-play']">

diff --git a/src/components/PopoverMenu/PopoverMenuItem.vue b/src/components/PopoverMenu/PopoverMenuItem.vue
@@ -82,6 +82,7 @@
 			class="menuitem focusable"
 			:class="{active: item.active}"
 			:disabled="item.disabled"
+			type="button"
 			@click.stop.prevent="item.action">
 			<span :class="item.icon" />
 			<p v-if="item.text && item.longtext">