Chromium Code Reviews| Index: chrome/browser/resources/options/password_manager.js |
| diff --git a/chrome/browser/resources/options/password_manager.js b/chrome/browser/resources/options/password_manager.js |
| index 3e501727ff7b904a63df1d7a3843d10c35f21985..67c2aa773ebe40a9a70b2c113bacdf582bd8692c 100644 |
| --- a/chrome/browser/resources/options/password_manager.js |
| +++ b/chrome/browser/resources/options/password_manager.js |
| @@ -165,6 +165,30 @@ cr.define('options', function() { |
| }, |
| /** |
| + * Updates eliding of origins. If there is no enough space to show the full |
| + * origin, the origin is elided from the left with ellipsis. |
| + * @param {!cr.ui.List} list The list to update eliding. |
| + */ |
| + updateOriginsEliding_: function(list) { |
| + var entries = list.getElementsByClassName('deletable-item'); |
| + if (entries.length == 0) |
| + return; |
| + var entry = entries[0]; |
| + var computedStyle = window.getComputedStyle(entry.urlDiv); |
| + var columnWidth = entry.urlDiv.offsetWidth - |
| + parseInt(computedStyle.webkitMarginStart, 10) - |
| + parseInt(computedStyle.webkitPaddingStart, 10); |
| + for (var i = 0; i < entries.length; ++i) { |
| + var urlLink = entries[i].urlLink; |
| + if (entries[i].isAndroidUri || urlLink.offsetWidth <= columnWidth) |
| + continue; |
| + urlLink.textContent = '…' + urlLink.textContent.substring(1); |
| + while (urlLink.offsetWidth > columnWidth) |
| + urlLink.textContent = '…' + urlLink.textContent.substring(2); |
| + } |
| + }, |
| + |
| + /** |
| * Updates the data model for the saved passwords list with the values from |
| * |entries|. |
| * @param {!Array} entries The list of saved password data. |
| @@ -191,6 +215,7 @@ cr.define('options', function() { |
| } |
| this.savedPasswordsList_.dataModel = new ArrayDataModel(entries); |
| this.updateListVisibility_(this.savedPasswordsList_); |
| + this.updateOriginsEliding_(this.savedPasswordsList_); |
| }, |
| /** |
| @@ -201,6 +226,7 @@ cr.define('options', function() { |
| setPasswordExceptionsList_: function(entries) { |
| this.passwordExceptionsList_.dataModel = new ArrayDataModel(entries); |
| this.updateListVisibility_(this.passwordExceptionsList_); |
|
Evan Stade
2016/03/23 18:53:30
if the order matters here, that's subtle and deser
kolos1
2016/03/24 07:45:43
Done.
|
| + this.updateOriginsEliding_(this.passwordExceptionsList_); |
| }, |
| /** |