From 0d7e6d4af351093247e2f15e0275a0011891d179 Mon Sep 17 00:00:00 2001
From: Stephan Lee <stephanwlee@gmail.com>
Date: Thu, 7 Mar 2019 10:06:19 -0800
Subject: [PATCH 1/3] scalar: use ObjectURL for SVG link for durability

Data uri in the link for download has given us some trouble with
encoding and length limitations. We want to use the ObjectURL like
PR#1610 that is more durable to aforementioned limitations.
---
 .../scalar/tf_scalar_dashboard/tf-scalar-card.html | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/tensorboard/plugins/scalar/tf_scalar_dashboard/tf-scalar-card.html b/tensorboard/plugins/scalar/tf_scalar_dashboard/tf-scalar-card.html
index 1605974b43..2c04d7e3ad 100644
--- a/tensorboard/plugins/scalar/tf_scalar_dashboard/tf-scalar-card.html
+++ b/tensorboard/plugins/scalar/tf_scalar_dashboard/tf-scalar-card.html
@@ -80,7 +80,9 @@
       title="Fit domain to data"
     ></paper-icon-button>
     <template is="dom-if" if="[[showDownloadLinks]]">
-      <paper-menu-button on-paper-dropdown-open="_updateDownloadLink">
+      <paper-menu-button
+          on-paper-dropdown-open="_updateDownloadLink"
+          on-paper-dropdown-close="_removeDownloadLink">
         <paper-icon-button
           class="dropdown-trigger"
           slot="dropdown-trigger"
@@ -314,11 +316,21 @@
       },
       _updateDownloadLink() {
         const svgStr = this.$$('tf-line-chart-data-loader').exportAsSvgString();
+<<<<<<< HEAD
         // The SVG code string may include hash characters, such as an
         // attribute `clipPath="url(#foo)"`. Thus, we base64-encode the
         // data so that such a hash is not interpreted as a fragment
         // specifier, truncating the SVG. (See issue #1874.)
         this.$$('#svgLink').href = `data:image/svg+xml;base64,${btoa(svgStr)}`;
+=======
+        const bytes = new Uint8Array(svgStr.length).map((_, i) => svgStr.charCodeAt(i));
+        const blob = new Blob([bytes], {type: 'image/svg+xml'});
+        this.$$('#svgLink').setAttribute('href', URL.createObjectURL(blob));
+      },
+      _removeDownloadLink() {
+        URL.revokeObjectURL(this.$$('#svgLink').href);
+        this.$$('#svgLink').removeAttribute('href');
+>>>>>>> scalar: use ObjectURL for SVG link for durability
       },
       _runsFromData(data) {
         return data.map((datum) => datum.run);

From 289bf7483987bb13c1ef8aa1ea48e5e1a1f6fad3 Mon Sep 17 00:00:00 2001
From: Stephan Lee <stephanwlee@gmail.com>
Date: Thu, 7 Mar 2019 14:03:08 -0800
Subject: [PATCH 2/3] Fixing the bad merge conflict reconciliation

---
 .../scalar/tf_scalar_dashboard/tf-scalar-card.html        | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/tensorboard/plugins/scalar/tf_scalar_dashboard/tf-scalar-card.html b/tensorboard/plugins/scalar/tf_scalar_dashboard/tf-scalar-card.html
index 2c04d7e3ad..280971be96 100644
--- a/tensorboard/plugins/scalar/tf_scalar_dashboard/tf-scalar-card.html
+++ b/tensorboard/plugins/scalar/tf_scalar_dashboard/tf-scalar-card.html
@@ -316,13 +316,6 @@
       },
       _updateDownloadLink() {
         const svgStr = this.$$('tf-line-chart-data-loader').exportAsSvgString();
-<<<<<<< HEAD
-        // The SVG code string may include hash characters, such as an
-        // attribute `clipPath="url(#foo)"`. Thus, we base64-encode the
-        // data so that such a hash is not interpreted as a fragment
-        // specifier, truncating the SVG. (See issue #1874.)
-        this.$$('#svgLink').href = `data:image/svg+xml;base64,${btoa(svgStr)}`;
-=======
         const bytes = new Uint8Array(svgStr.length).map((_, i) => svgStr.charCodeAt(i));
         const blob = new Blob([bytes], {type: 'image/svg+xml'});
         this.$$('#svgLink').setAttribute('href', URL.createObjectURL(blob));
@@ -330,7 +323,6 @@
       _removeDownloadLink() {
         URL.revokeObjectURL(this.$$('#svgLink').href);
         this.$$('#svgLink').removeAttribute('href');
->>>>>>> scalar: use ObjectURL for SVG link for durability
       },
       _runsFromData(data) {
         return data.map((datum) => datum.run);

From b699c02bce0ab4b42bbbe943000e7565f40f26d8 Mon Sep 17 00:00:00 2001
From: Stephan Lee <stephanwlee@gmail.com>
Date: Thu, 7 Mar 2019 15:50:10 -0800
Subject: [PATCH 3/3] Use the TextEncoder which is cool

---
 .../plugins/scalar/tf_scalar_dashboard/tf-scalar-card.html      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tensorboard/plugins/scalar/tf_scalar_dashboard/tf-scalar-card.html b/tensorboard/plugins/scalar/tf_scalar_dashboard/tf-scalar-card.html
index 280971be96..7e08bdf21c 100644
--- a/tensorboard/plugins/scalar/tf_scalar_dashboard/tf-scalar-card.html
+++ b/tensorboard/plugins/scalar/tf_scalar_dashboard/tf-scalar-card.html
@@ -316,7 +316,7 @@
       },
       _updateDownloadLink() {
         const svgStr = this.$$('tf-line-chart-data-loader').exportAsSvgString();
-        const bytes = new Uint8Array(svgStr.length).map((_, i) => svgStr.charCodeAt(i));
+        const bytes = new TextEncoder().encode(svgStr);
         const blob = new Blob([bytes], {type: 'image/svg+xml'});
         this.$$('#svgLink').setAttribute('href', URL.createObjectURL(blob));
       },