From fa0445679d92ea32d7de9fde3f5a438fc647946c Mon Sep 17 00:00:00 2001
From: Theodore Abshire <theodab@google.com>
Date: Tue, 27 Aug 2019 12:18:11 -0700
Subject: [PATCH] Added a confirm dialog for deleting custom assets.

Change-Id: I81df896797262f2fc38019714c4dc289134cc413
---
 demo/asset_card.js | 34 ++++++++++++++++++++++++++--------
 demo/custom.js     |  4 +++-
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/demo/asset_card.js b/demo/asset_card.js
index 247b89f7f1..790b43f578 100644
--- a/demo/asset_card.js
+++ b/demo/asset_card.js
@@ -287,7 +287,7 @@ shakaDemo.AssetCard = class {
     }
     if (this.asset_.isStored()) {
       const deleteButton = this.addButton('', () => {
-        this.makeDeleteDialog_(deleteButton);
+        this.attachDeleteDialog_(deleteButton);
       });
       styleAsDownloadButton(deleteButton, deleteButton, 'offline_pin');
     } else {
@@ -304,12 +304,27 @@ shakaDemo.AssetCard = class {
    * @param {!Element} deleteButton
    * @private
    */
-  makeDeleteDialog_(deleteButton) {
+  attachDeleteDialog_(deleteButton) {
     const parentDiv = this.card_.parentElement;
     if (!parentDiv) {
       return;
     }
 
+    // TODO: Localize these messages.
+    const deleteMessage = 'Delete the offline copy?';
+    this.makeYesNoDialogue_(parentDiv, deleteMessage, async () => {
+      deleteButton.disabled = true;
+      await this.asset_.unstoreCallback();
+    });
+  }
+
+  /**
+   * @param {!Element} parentDiv
+   * @param {string} text
+   * @param {function():Promise} callback
+   * @private
+   */
+  makeYesNoDialogue_(parentDiv, text, callback) {
     const dialog = document.createElement('dialog');
     dialog.classList.add('mdl-dialog');
     parentDiv.appendChild(dialog);
@@ -319,8 +334,7 @@ shakaDemo.AssetCard = class {
 
     const textElement = document.createElement('h2');
     textElement.classList.add('mdl-typography--title');
-    // TODO: Localize these messages.
-    textElement.textContent = 'Delete the offline copy?';
+    textElement.textContent = text;
     dialog.appendChild(textElement);
 
     const buttonsDiv = document.createElement('div');
@@ -341,8 +355,7 @@ shakaDemo.AssetCard = class {
     // TODO: Localize these messages.
     makeButton('Yes', async () => {
       dialog.close();
-      deleteButton.disabled = true;
-      await this.asset_.unstoreCallback();
+      await callback();
       this.remakeButtons();
     });
     makeButton('No', () => {
@@ -375,9 +388,10 @@ shakaDemo.AssetCard = class {
    * clicked. For example, a play or delete button.
    * @param {string} name
    * @param {function()} onclick
+   * @param {string=} yesNoDialogText
    * @return {!Element}
    */
-  addButton(name, onclick) {
+  addButton(name, onclick, yesNoDialogText) {
     const button = document.createElement('button');
     button.classList.add('mdl-button');
     button.classList.add('mdl-button--colored');
@@ -386,7 +400,11 @@ shakaDemo.AssetCard = class {
     button.textContent = name;
     button.addEventListener('click', () => {
       if (!button.hasAttribute('disabled')) {
-        onclick();
+        if (yesNoDialogText) {
+          this.makeYesNoDialogue_(this.actions_, yesNoDialogText, onclick);
+        } else {
+          onclick();
+        }
       }
     });
     this.actions_.appendChild(button);
diff --git a/demo/custom.js b/demo/custom.js
index a1ef2b5e8a..dc9acbf647 100644
--- a/demo/custom.js
+++ b/demo/custom.js
@@ -372,6 +372,8 @@ shakaDemo.Custom = class {
         }
         this.showAssetDialog_(asset);
       });
+      // TODO: Localize these messages.
+      const deleteDialog = 'Delete this custom asset?';
       c.addButton('Delete', async () => {
         this.assets_.delete(asset);
         if (asset.unstoreCallback) {
@@ -379,7 +381,7 @@ shakaDemo.Custom = class {
         }
         this.saveAssetInfos_(this.assets_);
         this.remakeSavedList_();
-      });
+      }, deleteDialog);
       c.addStoreButton();
     });
   }