@internetarchive/ia-book-actions 0.0.29-alpha13 → 0.0.29-alpha14

package/demo/index.html

@@ -278,6 +278,19 @@
         iaBookActions.bwbPurchaseUrl = bwbPurchaseUrl;
       })
     });
+
+    document.querySelector('.pageChangedEvent').addEventListener('click', () => {
+      // dispatch event to say book page has flipped
+      document.querySelector('ia-book-actions').dispatchEvent(
+        new CustomEvent('BookReader:pageChanged', {
+          detail: { isPageChanged: true },
+          bubbles: true,
+          composed: true,
+        })
+      );
+    })
+    
+
 </script>
 
   <div>
@@ -288,6 +301,9 @@
             <td class="titleBar">
               <label><input type="checkbox" name="title" value="title" />Title Bar</label>
             </td>
+            <td>
+              <button class="pageChangedEvent">Page Change</button>
+            </td>
           </tr>
         </table>
     </fieldset>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@internetarchive/ia-book-actions",
-  "version": "0.0.29-alpha13",
+  "version": "0.0.29-alpha14",
   "description": "Bookreader actions for borrowable book",
   "author": "Internet Archive",
   "license": "AGPL-3.0-only",

package/src/components/toast-message.js

@@ -22,7 +22,7 @@ export class ToastMessage extends LitElement {
             class="toast-message fade-in"
             title="Click/tap to close"
             @click=${() => {
-              this.dismisOnClick ? this.texts = null : nothing;
+              this.dismisOnClick ? (this.texts = null) : nothing;
             }}
             >${this.texts}</span
           >

package/src/core/services/one-hour-loan-renew.js

@@ -5,12 +5,7 @@ import { nothing } from 'lit';
  *
  */
 export class OneHourLoanRenew {
-  constructor(
-    isPageChanged,
-    identifier,
-    localCache,
-    loanRenewConfig
-  ) {
+  constructor(isPageChanged, identifier, localCache, loanRenewConfig) {
     this.isPageChanged = isPageChanged;
     this.identifier = identifier;
     this.localCache = localCache;
@@ -39,7 +34,7 @@ export class OneHourLoanRenew {
         console.log('page changed!!');
         return this.pageChanged(); // user clicked on page
       }
-      
+
       return this.autoChecker(); // auto checker at 50th minute
     } catch (error) {
       console.log(error);
@@ -94,7 +89,7 @@ export class OneHourLoanRenew {
       lastPageFlipTime <= lastFlipTimeFrame
     ) {
       // not viewed
-      console.log('Not viewed, don\'t borrow it!');
+      console.log("Not viewed, don't borrow it!");
       this.loanRenewResult.texts = this.loanReturnWarning;
       this.loanRenewResult.renewNow = false;
     } else if (lastPageFlipTime >= lastFlipTimeFrame) {
@@ -109,8 +104,7 @@ export class OneHourLoanRenew {
     return this.loanRenewResult;
   }
 
-
-  // save page changed time in indexedDB 
+  // save page changed time in indexedDB
   async setPageChangedTime() {
     await this.localCache.set({
       key: `${this.identifier}-pageChangedTime`,

package/src/ia-book-actions.js

@@ -73,7 +73,6 @@ export default class IABookActions extends LitElement {
       renewNow: false,
     };
 
-
     // private props
     this.primaryActions = [];
     this.primaryTitle = '';
@@ -114,27 +113,18 @@ export default class IABookActions extends LitElement {
 
   bindLoanRenewEvents() {
     // dispatched this event from bookreader page changed
-    window.addEventListener(`BookReader:pageChanged`, () => {
-      console.log('window addEventListener!')
-      // early return if book is not browsed (1 hour borrow)
-      if (this.borrowType !== 'browsed') return nothing;
-
-      this.isPageChanged = true;
-      this.executeLoanRenew();
-    })
-
-    this.addEventListener('BookReader:pageChanged', e => {
-      console.log('this addEventListener!')
-
+    window.addEventListener('BookReader:pageChanged', () => {
       // early return if book is not browsed (1 hour borrow)
-      if (this.borrowType !== 'browsed') return nothing;
+      if (this.borrowType === 'browsed') {
+        this.isPageChanged = true;
+        this.executeLoanRenew();
+      }
 
-      this.isPageChanged = true;
-      this.executeLoanRenew();
-    })
+      return nothing;
+    });
 
     // dispatched this event from timer-countdown
-    this.addEventListener('IABookActions:loanRenew', e => {
+    this.addEventListener('IABookActions:loanRenew', () => {
       this.isPageChanged = false;
       this.executeLoanRenew();
     });
@@ -148,7 +138,7 @@ export default class IABookActions extends LitElement {
       this.loanRenewConfig
     );
 
-    console.log(this.loanRenewResult)
+    console.log(this.loanRenewResult);
 
     if (this.loanRenewResult.renewNow) {
       this.tokenPoller.disconnectedInterval();
@@ -168,7 +158,8 @@ export default class IABookActions extends LitElement {
     await this.localCache.delete(`${this.identifier}-pageChangedTime`);
 
     // show message after browsed book is expired.
-    this.loanRenewResult.texts = 'This book has been auto-returned due to inactivity.';
+    this.loanRenewResult.texts =
+      'This book has been auto-returned due to inactivity.';
     this.update();
   }
 
@@ -296,9 +287,12 @@ export default class IABookActions extends LitElement {
     // - start token to poller around this.tokenDelay time until renew is completed
     // else
     // - start token poller immediately
-    setTimeout(() => {
-      this.startLoanTokenPoller();
-    }, this.loanRenewResult.renewNow ? this.tokenDelay : 100);
+    setTimeout(
+      () => {
+        this.startLoanTokenPoller();
+      },
+      this.loanRenewResult.renewNow ? this.tokenDelay : 100
+    );
   }
 
   render() {
@@ -340,7 +334,6 @@ export default class IABookActions extends LitElement {
 
   get bookActionBar() {
     return html`
-      <button @click=${() => this.pageChangedEvent()}>Page Change</button>
       <collapsible-action-group
         .userid=${this.userid}
         .identifier=${this.identifier}
@@ -357,6 +350,7 @@ export default class IABookActions extends LitElement {
         ?renewNow=${this.loanRenewResult.renewNow}
         @lendingActionError=${this.handleLendingActionError}
         @toggleActionGroup=${this.handleToggleActionGroup}
+        @BookReader:pageChanged=${() => console.log('dfd')}
       >
       </collapsible-action-group>
       ${this.textGroupTemplate} ${this.infoIconTemplate}