fixed the back button issue of search and recently viewed

Sunbird-AIAssistant · Jun 21, 2024 · 1dfc898 · 1dfc898
1 parent 5468a02
commit 1dfc898
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 20 deletions.
diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html
@@ -43,8 +43,8 @@
     </ion-item>
   </ion-list>
   <ion-list *ngIf="!showSheenAnimation && searchContentResult.length > 0"> 
-    <ion-item lines="none" *ngFor="let content of searchContentResult; let i = index">
-      <div class="card__img" (click)="playContent($event, content)">
+    <ion-item lines="none" *ngFor="let content of searchContentResult; let i = index" (click)="playContent($event, content)">
+      <div class="card__img">
         <!-- <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? content?.metaData?.thumbnail :'assets/images/Audio.png'" alt="" *ngIf="content.metaData.mimetype === mimeType.AUDIO">
         <img appThumbnail [appThumbnail]="content?.metaData" alt="" *ngIf="content.metaData.mimetype === mimeType.YOUTUBE">
         <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? content?.metaData?.thumbnail :'assets/images/Video.png'" alt="" *ngIf="content.metaData.mimetype === mimeType.MP4">
@@ -57,9 +57,9 @@
         <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? (content?.metaData?.thumbnail) : 'assets/images/LINK.png'" alt="" *ngIf="content.metaData.mimetype === mimeType.LINK">
         <!-- <img [src]="(content?.metaData?.thumbnail && !content.metaData.identifier.startsWith('do_')) ? content?.metaData?.thumbnail : 'assets/images/LINK.png'" alt="" *ngIf="content?.metaData?.mimetype === 'text/html'"> -->
       </div>
-      <div class="card__metadata" (click)="playContent($event, content)">
+      <div class="card__metadata">
         <div class="card__title">{{content.metaData?.name}}</div>
-        <ion-icon aria-hidden="true" src="assets/icon/kabab-icon.svg" (click)="moreOtions(content)"></ion-icon>
+        <ion-icon aria-hidden="true" src="assets/icon/kabab-icon.svg" (click)="moreOtions(content); $event.stopPropagation();"></ion-icon>
       </div>
     </ion-item>
   </ion-list>

diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts
@@ -59,7 +59,8 @@ export class SearchPage implements OnInit, OnTabViewWillEnter {
   ngOnInit() {}
 
   navigateBack() {
-    this.location.back();
+    // this.location.back();
+    this.router.navigate(['/tabs/home']);
   }
 
   ionViewWillEnter() {

diff --git a/src/app/pages/view-all/view-all.page.ts b/src/app/pages/view-all/view-all.page.ts
@@ -65,9 +65,10 @@ export class ViewAllPage implements OnInit {
       this.headerService.deviceBackBtnEvent({ name: 'backBtn' })
     });
     this.headerService.headerEventEmitted$.subscribe((event) => {
-      if(event === 'back' && !this.navigated) {
-        this.navigated = true;
-        this.location.back();
+      if(event === 'back') {
+        this.router.navigate(['/tabs/my-pitara']);
+        // this.navigated = true;
+        // this.location.back();
       }
     })
     this.getRecentlyviewedContent()

diff --git a/www/1983.b2900ffc09329d5f.js b/www/1983.b2900ffc09329d5f.js
diff --git a/www/1983.dee3f894b2bf6f03.js b/www/1983.dee3f894b2bf6f03.js
diff --git a/www/3119.53f5ff3b7649b20b.js b/www/3119.53f5ff3b7649b20b.js
diff --git a/www/3119.5e1cfecf3439bfbf.js b/www/3119.5e1cfecf3439bfbf.js
diff --git a/www/index.html b/www/index.html
@@ -24,6 +24,6 @@
 <body>
   <app-root></app-root>
   <noscript>Please enable JavaScript to continue using this application.</noscript>
-<script src="runtime.68deeddaff5750c6.js" type="module"></script><script src="polyfills.8aa0ed51fddab033.js" type="module"></script><script src="scripts.f969b614b9decf68.js" defer></script><script src="main.900d177c1519705a.js" type="module"></script></body>
+<script src="runtime.0cfaf2ef60763a81.js" type="module"></script><script src="polyfills.8aa0ed51fddab033.js" type="module"></script><script src="scripts.f969b614b9decf68.js" defer></script><script src="main.900d177c1519705a.js" type="module"></script></body>
 
 </html>
diff --git a/www/ngsw.json b/www/ngsw.json
@@ -1,6 +1,6 @@
 {
   "configVersion": 1,
-  "timestamp": 1718869013086,
+  "timestamp": 1718951701462,
   "index": "/index.html",
   "assetGroups": [
     {
@@ -18,7 +18,7 @@
         "/1227.caeaa0e1fff748b5.js",
         "/1433.2c059f00cb042b4f.js",
         "/1577.f78a0447c8f41a1b.js",
-        "/1983.dee3f894b2bf6f03.js",
+        "/1983.b2900ffc09329d5f.js",
         "/2075.f919952f47beca5b.js",
         "/2113.0c87c15ab9a91af5.js",
         "/2144.1466920522110c0f.js",
@@ -33,7 +33,7 @@
         "/2937.aa2ee25b0084be07.js",
         "/2982.aa513e7ab5d121b6.js",
         "/3066.1a60873367cf408d.js",
-        "/3119.5e1cfecf3439bfbf.js",
+        "/3119.53f5ff3b7649b20b.js",
         "/3162.0ec9926637ab8977.js",
         "/3506.1e89bee134eda505.js",
         "/3511.b2a5b41a523ba553.js",
@@ -106,7 +106,7 @@
         "/polyfills-core-js.c76198334f717402.js",
         "/polyfills-dom.bf542500b6fca113.js",
         "/polyfills.8aa0ed51fddab033.js",
-        "/runtime.68deeddaff5750c6.js",
+        "/runtime.0cfaf2ef60763a81.js",
         "/scripts.f969b614b9decf68.js",
         "/styles.4e8dacb696c69ef3.css"
       ],
@@ -448,7 +448,7 @@
     "/1227.caeaa0e1fff748b5.js": "18d583b2706462811ef76a4a5ca39eba0dee5a84",
     "/1433.2c059f00cb042b4f.js": "ade26877da379b4c06d68b6f5196ba2d346a592e",
     "/1577.f78a0447c8f41a1b.js": "0bfc15951b2357ae1400cfad33587d740f7f0e4c",
-    "/1983.dee3f894b2bf6f03.js": "71bc257de0c72e72b35398742232851a68f75a60",
+    "/1983.b2900ffc09329d5f.js": "885e887dc585ee682d2259574c8a9656e8ddd1b9",
     "/2075.f919952f47beca5b.js": "dbd8b4b0e5643ab95e252ff914234d5a96b1357b",
     "/2113.0c87c15ab9a91af5.js": "b7e1fa3eadce7d0dd624c2f52db5991e68505f07",
     "/2144.1466920522110c0f.js": "4f28225b93cbef80e550869045559f8595b748f1",
@@ -463,7 +463,7 @@
     "/2937.aa2ee25b0084be07.js": "052f53f63cdf3fc935060687c86d11599842cef1",
     "/2982.aa513e7ab5d121b6.js": "5609b767cafa6d92b2dbac0d1c5e3fed1399aa72",
     "/3066.1a60873367cf408d.js": "e1608e5cd0fbb5fea388573ca71e939a2dfa1e7f",
-    "/3119.5e1cfecf3439bfbf.js": "1bbe203bfd55732fe78b775d1a0d61ca5ac96d73",
+    "/3119.53f5ff3b7649b20b.js": "3480820525adba958caf538ae6d75709a00565d7",
     "/3162.0ec9926637ab8977.js": "46d9c12b0da81a26c3760a768303b1b44dbb8470",
     "/3506.1e89bee134eda505.js": "db3994d8732053a33c4f0eb75e91bc7c4e6981cd",
     "/3511.b2a5b41a523ba553.js": "3e88ee49446b7bbf11eb3e80f995b48bd6b37a14",
@@ -845,13 +845,13 @@
     "/assets/timer.svg": "57b27e5d93af2aabd1077ecd4c70bcab678f4472",
     "/assets/user.svg": "2dc572771661b2ccd3ea4ae06bf768778144cbec",
     "/common.d5afa357a12054a6.js": "4def9eb63d9c0e8e525a0fc947d54f807f1e5f88",
-    "/index.html": "cf2dc68bc8b47c3bce371181a522becea815f510",
+    "/index.html": "f07a3847d1a1be183a30301d748f4a9f9e8dbd1f",
     "/main.900d177c1519705a.js": "cbca8fc9da024ccac54653b5119cf145fc94ee00",
     "/manifest.webmanifest": "5a927f2c991153c4e1fb8dd9fd7845bbe00ba537",
     "/polyfills-core-js.c76198334f717402.js": "d6e270a2944b6a95a9b97dafd25599ba825e8d7f",
     "/polyfills-dom.bf542500b6fca113.js": "3fa333db66c8050f12e99d977f5098a6de8dd593",
     "/polyfills.8aa0ed51fddab033.js": "52a4225db39c3a19f31842d5205497fb87127245",
-    "/runtime.68deeddaff5750c6.js": "bbf51945a7d6a3f33944dceb35f0fcbb2f598f20",
+    "/runtime.0cfaf2ef60763a81.js": "8b714107fb4b51d9da6507d3a9e24031ee14075b",
     "/scripts.f969b614b9decf68.js": "467091cacab9e36440117d8c26effba07c491af9",
     "/styles.4e8dacb696c69ef3.css": "c63283b3d95887a1fd9dcc217de175071c24864f"
   },

diff --git a/www/runtime.68deeddaff5750c6.js → www/runtime.0cfaf2ef60763a81.js b/www/runtime.68deeddaff5750c6.js → www/runtime.0cfaf2ef60763a81.js