Commit 7f687518 authored by rbpotter's avatar rbpotter Committed by Commit Bot

WebUI iron-list: fix chromium.patch

Bug: 899113
Change-Id: Idc90d221cdfbdb11e042b88985ef9394fad20409
Reviewed-on: https://chromium-review.googlesource.com/c/1330335
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607810}
parent 1f15ef93
...@@ -27,7 +27,8 @@ index 43c59653a39b..26652936735c 100644 ...@@ -27,7 +27,8 @@ index 43c59653a39b..26652936735c 100644
+ value: false + value: false
} }
}, },
@@ -786,6 +794,39 @@
@@ -786,11 +794,53 @@
newGrid && this._updateGridMetrics(); newGrid && this._updateGridMetrics();
}, },
...@@ -64,7 +65,8 @@ index 43c59653a39b..26652936735c 100644 ...@@ -64,7 +65,8 @@ index 43c59653a39b..26652936735c 100644
+ return focusWithin ? doSearch(focusWithin, ':focus') : null; + return focusWithin ? doSearch(focusWithin, ':focus') : null;
+ }, + },
+ +
@@ -791,6 +836,15 @@ /**
* Called when the items have changed. That is, reassignments
* to `items`, splices or updates to a single item. * to `items`, splices or updates to a single item.
*/ */
_itemsChanged: function(change) { _itemsChanged: function(change) {
...@@ -72,7 +74,7 @@ index 43c59653a39b..26652936735c 100644 ...@@ -72,7 +74,7 @@ index 43c59653a39b..26652936735c 100644
+ var lastFocusedIndex, focusedElement; + var lastFocusedIndex, focusedElement;
+ if (rendering && this.preserveFocus) { + if (rendering && this.preserveFocus) {
+ lastFocusedIndex = this._focusedVirtualIndex; + lastFocusedIndex = this._focusedVirtualIndex;
+ focusedElement = this.querySelector('* /deep/ *:focus'); + focusedElement = this._getFocusedElement();
+ } + }
+ +
+ var preservingFocus = rendering && this.preserveFocus && focusedElement; + var preservingFocus = rendering && this.preserveFocus && focusedElement;
...@@ -80,7 +82,7 @@ index 43c59653a39b..26652936735c 100644 ...@@ -80,7 +82,7 @@ index 43c59653a39b..26652936735c 100644
if (change.path === 'items') { if (change.path === 'items') {
this._virtualStart = 0; this._virtualStart = 0;
this._physicalTop = 0; this._physicalTop = 0;
@@ -804,7 +858,7 @@ @@ -804,7 +854,7 @@
this._physicalItems = this._physicalItems || []; this._physicalItems = this._physicalItems || [];
this._physicalSizes = this._physicalSizes || []; this._physicalSizes = this._physicalSizes || [];
this._physicalStart = 0; this._physicalStart = 0;
...@@ -89,7 +91,7 @@ index 43c59653a39b..26652936735c 100644 ...@@ -89,7 +91,7 @@ index 43c59653a39b..26652936735c 100644
this._resetScrollPosition(0); this._resetScrollPosition(0);
} }
this._removeFocusedItem(); this._removeFocusedItem();
@@ -826,6 +880,17 @@ @@ -834,6 +884,17 @@
} else if (change.path !== 'items.length') { } else if (change.path !== 'items.length') {
this._forwardItemPath(change.path, change.value); this._forwardItemPath(change.path, change.value);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment