Merge pull request #24194 from nextcloud/enh/noid/clear-weather-favor…

…ites Add action to clear all weather favorites
nextcloud · Dec 16, 2020 · 15e4f1c · 15e4f1c
2 parents bf5aa88 + 777fe3b
commit 15e4f1c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/apps/weather_status/js/weather-status.js b/apps/weather_status/js/weather-status.js
diff --git a/apps/weather_status/js/weather-status.js.map b/apps/weather_status/js/weather-status.js.map
diff --git a/apps/weather_status/src/App.vue b/apps/weather_status/src/App.vue
@@ -63,7 +63,7 @@
 				<ActionButton v-for="f in displayedFavorites"
 					:key="f"
 					icon="icon-starred"
-					@click="onFavoriteClick(f)">
+					@click="onFavoriteClick($event, f)">
 					{{ f }}
 				</ActionButton>
 			</Actions>
@@ -439,8 +439,16 @@ export default {
 			}
 			network.saveFavorites(this.favorites)
 		},
-		onFavoriteClick(favAddress) {
-			if (favAddress !== this.address) {
+		onFavoriteClick(e, favAddress) {
+			// clicked on the icon
+			if (e.target.classList.contains('action-button__icon')) {
+				const i = this.favorites.indexOf(favAddress)
+				if (i !== -1) {
+					this.favorites.splice(i, 1)
+				}
+				network.saveFavorites(this.favorites)
+			} else if (favAddress !== this.address) {
+				// clicked on the text
 				this.setAddress(favAddress)
 			}
 		},