From 27878c64127735589cdfdd1bfc660cf56f840e7b Mon Sep 17 00:00:00 2001 From: Jason Wall Date: Tue, 21 Jul 2020 21:22:33 -0400 Subject: [PATCH] hook up passages and strongs from within cards --- .../components/passage/passage.component.ts | 10 +++---- .../components/strongs/strongs.component.ts | 30 ++++--------------- 2 files changed, 10 insertions(+), 30 deletions(-) diff --git a/app/db/src/app/search/components/passage/passage.component.ts b/app/db/src/app/search/components/passage/passage.component.ts index fbf7489c..0cf2a185 100644 --- a/app/db/src/app/search/components/passage/passage.component.ts +++ b/app/db/src/app/search/components/passage/passage.component.ts @@ -147,12 +147,10 @@ export class PassageComponent extends CardComponent implements OnInit { this.appService.updatePassage(this.cardItem, this.ref); } - openStrongs(strongs: string) { - this.onItemClicked.emit({ - card: this.cardItem, - qry: this.cardItem.dict + strongs, - from_search_bar: false, - }); + openStrongs(q: string) { + const dict = q.substring(0, 1).search(/h/i) !== -1 ? 'heb' : 'grk'; + const strongsNumber = q.substring(1, q.length); + this.appService.getNewStrongs(strongsNumber, dict); } isPunct(c: string) { diff --git a/app/db/src/app/search/components/strongs/strongs.component.ts b/app/db/src/app/search/components/strongs/strongs.component.ts index aadc864e..2d13f7d5 100644 --- a/app/db/src/app/search/components/strongs/strongs.component.ts +++ b/app/db/src/app/search/components/strongs/strongs.component.ts @@ -19,20 +19,6 @@ export class StrongsComponent extends CardComponent { super(elementRef); } - // @HostListener('window:resize', ['$event']) - // onResize(evt) { - // $('strongs ion-scroll').each((i, el) => { - // let len = $(el).find('.scroll-content .scroll-zoom-wrapper dl span') - // .length; - // len += $(el).find('.scroll-content .scroll-zoom-wrapper dl dd').length; - // if (len < 20) $(el).css('height', Math.ceil(len / 3) * 30 + 30); - // }); - // } - - // ngAfterViewChecked(): void { - // this.onResize(null); - // } - copy() { const html = this.strongsElement.nativeElement.innerHTML; const text = this.strongsElement.nativeElement.innerText; @@ -48,21 +34,17 @@ export class StrongsComponent extends CardComponent { } makePassage(p: string) { - return ( + return new BibleReference( BibleReference.bookName(parseInt(p.split(';')[0], 10)).name + - ' ' + - p.split(';')[1] + - ':' + - p.split(';')[2] + ' ' + + p.split(';')[1] + + ':' + + p.split(';')[2] ); } openPassage(p: string) { const ref = this.makePassage(p); - this.onItemClicked.emit({ - card: this.cardItem, - qry: ref, - from_search_bar: false, - }); + this.appService.getNewPassage(ref); } }