From 049cc0bc094f29eb062f80bf3c9143e9a9c373f1 Mon Sep 17 00:00:00 2001
From: Dmitrii Filippov <dmfilippov@google.com>
Date: Tue, 12 Nov 2019 10:50:39 +0100
Subject: [PATCH] Use attribute binding for data-... attributes

See: https://polymer-library.polymer-project.org/2.0/docs/devguide/data-binding#native-binding
Change-Id: Ia0791729705cf8a02b3fbbb98961c274e80dedf9
---
 .../gr-plugin-config-array-editor.html                      | 2 +-
 .../gr-plugin-config-array-editor.js                        | 2 +-
 .../elements/settings/gr-menu-editor/gr-menu-editor.html    | 6 +++---
 .../app/elements/settings/gr-menu-editor/gr-menu-editor.js  | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/polygerrit-ui/app/elements/admin/gr-plugin-config-array-editor/gr-plugin-config-array-editor.html b/polygerrit-ui/app/elements/admin/gr-plugin-config-array-editor/gr-plugin-config-array-editor.html
index 5afd5b65da..276152688a 100644
--- a/polygerrit-ui/app/elements/admin/gr-plugin-config-array-editor/gr-plugin-config-array-editor.html
+++ b/polygerrit-ui/app/elements/admin/gr-plugin-config-array-editor/gr-plugin-config-array-editor.html
@@ -73,7 +73,7 @@ limitations under the License.
               <gr-button
                   link
                   disabled$="[[disabled]]"
-                  data-item="[[item]]"
+                  data-item$="[[item]]"
                   on-click="_handleDelete">Delete</gr-button>
             </div>
           </template>
diff --git a/polygerrit-ui/app/elements/admin/gr-plugin-config-array-editor/gr-plugin-config-array-editor.js b/polygerrit-ui/app/elements/admin/gr-plugin-config-array-editor/gr-plugin-config-array-editor.js
index ab4d286cd7..bb0d501442 100644
--- a/polygerrit-ui/app/elements/admin/gr-plugin-config-array-editor/gr-plugin-config-array-editor.js
+++ b/polygerrit-ui/app/elements/admin/gr-plugin-config-array-editor/gr-plugin-config-array-editor.js
@@ -67,7 +67,7 @@
     },
 
     _handleDelete(e) {
-      const value = Polymer.dom(e).localTarget.dataItem;
+      const value = Polymer.dom(e).localTarget.dataset.item;
       this._dispatchChanged(
           this.pluginOption.info.values.filter(str => str !== value));
     },
diff --git a/polygerrit-ui/app/elements/settings/gr-menu-editor/gr-menu-editor.html b/polygerrit-ui/app/elements/settings/gr-menu-editor/gr-menu-editor.html
index df44c52ccc..1485628511 100644
--- a/polygerrit-ui/app/elements/settings/gr-menu-editor/gr-menu-editor.html
+++ b/polygerrit-ui/app/elements/settings/gr-menu-editor/gr-menu-editor.html
@@ -61,21 +61,21 @@ limitations under the License.
               <td class="buttonColumn">
                 <gr-button
                     link
-                    data-index="[[index]]"
+                    data-index$="[[index]]"
                     on-click="_handleMoveUpButton"
                     class="moveUpButton">↑</gr-button>
               </td>
               <td class="buttonColumn">
                 <gr-button
                     link
-                    data-index="[[index]]"
+                    data-index$="[[index]]"
                     on-click="_handleMoveDownButton"
                     class="moveDownButton">↓</gr-button>
               </td>
               <td>
                 <gr-button
                     link
-                    data-index="[[index]]"
+                    data-index$="[[index]]"
                     on-click="_handleDeleteButton"
                     class="remove-button">Delete</gr-button>
               </td>
diff --git a/polygerrit-ui/app/elements/settings/gr-menu-editor/gr-menu-editor.js b/polygerrit-ui/app/elements/settings/gr-menu-editor/gr-menu-editor.js
index aa83bf7de6..4f3c0c793f 100644
--- a/polygerrit-ui/app/elements/settings/gr-menu-editor/gr-menu-editor.js
+++ b/polygerrit-ui/app/elements/settings/gr-menu-editor/gr-menu-editor.js
@@ -27,7 +27,7 @@
     },
 
     _handleMoveUpButton(e) {
-      const index = Polymer.dom(e).localTarget.dataIndex;
+      const index = Number(Polymer.dom(e).localTarget.dataset.index);
       if (index === 0) { return; }
       const row = this.menuItems[index];
       const prev = this.menuItems[index - 1];
@@ -35,7 +35,7 @@
     },
 
     _handleMoveDownButton(e) {
-      const index = Polymer.dom(e).localTarget.dataIndex;
+      const index = Number(Polymer.dom(e).localTarget.dataset.index);
       if (index === this.menuItems.length - 1) { return; }
       const row = this.menuItems[index];
       const next = this.menuItems[index + 1];
@@ -43,7 +43,7 @@
     },
 
     _handleDeleteButton(e) {
-      const index = Polymer.dom(e).localTarget.dataIndex;
+      const index = Number(Polymer.dom(e).localTarget.dataset.index);
       this.splice('menuItems', index, 1);
     },