]> git.immae.eu Git - github/Chocobozzz/PeerTube.git/commitdiff
Fix search on ios
authorChocobozzz <me@florianbigard.com>
Fri, 3 Dec 2021 15:04:45 +0000 (16:04 +0100)
committerChocobozzz <me@florianbigard.com>
Fri, 3 Dec 2021 15:04:45 +0000 (16:04 +0100)
client/src/app/header/search-typeahead.component.html
client/src/app/header/search-typeahead.component.ts

index 0ced249a73a2989411529ee6727841f8a11d0092..9b21d3f864e33c31c967e9a0133eb28b3332c9b0 100644 (file)
@@ -1,7 +1,7 @@
 <div class="d-inline-flex position-relative" id="typeahead-container">
   <input
-    type="text" id="search-video" name="search-video" #searchVideo i18n-placeholder placeholder="Search videos, playlists, channels…"
-    [(ngModel)]="search" (ngModelChange)="onSearchChange()" (keydown)="handleKey($event)" (keydown.enter)="doSearch()"
+    type="search" id="search-video" name="search-video" #searchVideo i18n-placeholder placeholder="Search videos, playlists, channels…"
+    [(ngModel)]="search" (ngModelChange)="onSearchChange()" (keydown)="handleKey($event)"
     aria-label="Search" autocomplete="off"
   >
   <my-global-icon
@@ -14,7 +14,7 @@
     <ul [hidden]="!search || !areSuggestionsOpened" role="listbox" class="p-0 m-0">
       <li
         *ngFor="let result of results; let i = index" class="suggestion d-flex flex-justify-start flex-items-center p-0 f5"
-        role="option" aria-selected="true" (mouseenter)="onSuggestionHover(i)" (click)="onSuggestionlicked(result)"
+        role="option" aria-selected="true" (mouseenter)="onSuggestionHover(i)" (click)="onSuggestionClicked(result)"
       >
         <my-suggestion [result]="result" [highlight]="search"></my-suggestion>
       </li>
index e10baea2b967a5a98ba0f5bf84a7b214144dad4b..0794ec8f4774e7f3d71b70cf1bd7d593927b2786 100644 (file)
@@ -152,7 +152,7 @@ export class SearchTypeaheadComponent implements OnInit, AfterViewChecked, OnDes
     }
   }
 
-  onSuggestionlicked (payload: SuggestionPayload) {
+  onSuggestionClicked (payload: SuggestionPayload) {
     this.doSearch(this.buildSearchTarget(payload))
   }
 
@@ -170,6 +170,11 @@ export class SearchTypeaheadComponent implements OnInit, AfterViewChecked, OnDes
 
         this.keyboardEventsManager.onKeydown(event)
         break
+
+      case 'Enter':
+        event.stopPropagation()
+        this.doSearch()
+        break
     }
   }