Merge pull request #5472 from ChadKillingsworth/2.x-path-reflection

Update several string references which can be renamed by closure-compiler
Polymer · Feb 19, 2019 · e7be356 · e7be356
2 parents 555dbe3 + 40d5881
commit e7be356
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/lib/elements/array-selector.html b/lib/elements/array-selector.html
@@ -122,7 +122,7 @@
 
       __updateSelection(multi, itemsInfo) {
         let path = itemsInfo.path;
-        if (path == 'items') {
+        if (path == JSCompiler_renameProperty('items', this)) {
           // Case 1 - items array changed, so diff against previous array and
           // deselect any removed items and adjust selected indices
           let newItems = itemsInfo.base || [];
@@ -137,14 +137,14 @@
           }
           this.__lastItems = newItems;
           this.__lastMulti = multi;
-        } else if (itemsInfo.path == 'items.splices') {
+        } else if (itemsInfo.path == `${JSCompiler_renameProperty('items', this)}.splices`) {
           // Case 2 - got specific splice information describing the array mutation:
           // deselect any removed items and adjust selected indices
           this.__applySplices(itemsInfo.value.indexSplices);
         } else {
           // Case 3 - an array element was changed, so deselect the previous
           // item for that index if it was previously selected
-          let part = path.slice('items.'.length);
+          let part = path.slice(`${JSCompiler_renameProperty('items', this)}.`.length);
           let idx = parseInt(part, 10);
           if ((part.indexOf('.') < 0) && part == idx) {
             this.__deselectChangedIdx(idx);
@@ -182,7 +182,7 @@
         selected.forEach((idx, item) => {
           if (idx < 0) {
             if (this.multi) {
-              this.splice('selected', sidx, 1);
+              this.splice(JSCompiler_renameProperty('selected', this), sidx, 1);
             } else {
               this.selected = this.selectedItem = null;
             }
@@ -199,13 +199,13 @@
           let sidx = 0;
           this.__selectedMap.forEach(idx => {
             if (idx >= 0) {
-              this.linkPaths('items.' + idx, 'selected.' + sidx++);
+              this.linkPaths(`${JSCompiler_renameProperty('items', this)}.${idx}`, `${JSCompiler_renameProperty('selected', this)}.${sidx++}`);
             }
           });
         } else {
           this.__selectedMap.forEach(idx => {
-            this.linkPaths('selected', 'items.' + idx);
-            this.linkPaths('selectedItem', 'items.' + idx);
+            this.linkPaths(JSCompiler_renameProperty('selected', this), `${JSCompiler_renameProperty('items', this)}.${idx}`);
+            this.linkPaths(JSCompiler_renameProperty('selectedItem', this), `${JSCompiler_renameProperty('items', this)}.${idx}`);
           });
         }
       }
@@ -260,9 +260,9 @@
       }
 
       __selectedIndexForItemIndex(idx) {
-        let selected = this.__dataLinkedPaths['items.' + idx];
+        let selected = this.__dataLinkedPaths[`${JSCompiler_renameProperty('items', this)}.${idx}`];
         if (selected) {
-          return parseInt(selected.slice('selected.'.length), 10);
+          return parseInt(selected.slice(`${JSCompiler_renameProperty('selected', this)}.`.length), 10);
         }
       }
 
@@ -282,7 +282,7 @@
           }
           this.__updateLinks();
           if (this.multi) {
-            this.splice('selected', sidx, 1);
+            this.splice(JSCompiler_renameProperty('selected', this), sidx, 1);
           } else {
             this.selected = this.selectedItem = null;
           }
@@ -326,7 +326,7 @@
           this.__selectedMap.set(item, idx);
           this.__updateLinks();
           if (this.multi) {
-            this.push('selected', item);
+            this.push(JSCompiler_renameProperty('selected', this), item);
           } else {
             this.selected = this.selectedItem = item;
           }

diff --git a/lib/elements/dom-repeat.html b/lib/elements/dom-repeat.html
@@ -384,7 +384,7 @@
               if (prop == this.as) {
                 this.items[idx] = value;
               }
-              let path = Polymer.Path.translate(this.as, 'items.' + idx, prop);
+              let path = Polymer.Path.translate(this.as, `${JSCompiler_renameProperty('items', this)}.${idx}`, prop);
               this.notifyPath(path, value);
             }
           }