Chromium Code Reviews| Index: chrome/browser/resources/options2/certificate_tree.js |
| diff --git a/chrome/browser/resources/options2/certificate_tree.js b/chrome/browser/resources/options2/certificate_tree.js |
| index 95ff5fb4feb8bbd4d2b59974564d16d72ebdb6d5..e84dbfa77c46f76ae064c912f9c6a62c39093e4b 100644 |
| --- a/chrome/browser/resources/options2/certificate_tree.js |
| +++ b/chrome/browser/resources/options2/certificate_tree.js |
| @@ -7,12 +7,46 @@ cr.define('options', function() { |
| /** @const */ var TreeItem = cr.ui.TreeItem; |
| /** |
| + * Creates a new tree folder for certificate data. |
| + * @param {Object=} data Data used to create a certificate tree folder. |
| + * @constructor |
| + * @extends {TreeItem} |
| + */ |
| + function CertificateTreeFolder(data) { |
| + data.isCert = false; |
| + var treeFolder = new TreeItem({ |
| + label: data.name, |
| + data: data |
| + }); |
| + treeFolder.__proto__ = CertificateTreeFolder.prototype; |
| + |
| + if (data.icon) { |
| + treeFolder.icon = data.icon; |
| + } |
|
Evan Stade
2012/07/13 06:28:21
no curlies. In fact I don't think you even need th
mattm
2012/07/13 20:06:28
done
|
| + |
| + return treeFolder; |
| + } |
| + |
| + CertificateTreeFolder.prototype = { |
| + __proto__: TreeItem.prototype, |
| + |
| + /** |
| + * The tree path id/. |
| + * @type {string} |
| + */ |
| + get pathId() { |
| + return this.data.id; |
| + } |
| + }; |
| + |
| + /** |
| * Creates a new tree item for certificate data. |
| * @param {Object=} data Data used to create a certificate tree item. |
| * @constructor |
| * @extends {TreeItem} |
| */ |
| function CertificateTreeItem(data) { |
| + data.isCert = true; |
| // TODO(mattm): other columns |
| var treeItem = new TreeItem({ |
| label: data.name, |
| @@ -43,12 +77,7 @@ cr.define('options', function() { |
| * @type {string} |
| */ |
| get pathId() { |
| - var parent = this.parentItem; |
| - if (parent && parent instanceof CertificateTreeItem) { |
| - return parent.pathId + ',' + this.data.id; |
| - } else { |
| - return this.data.id; |
| - } |
| + return this.parentItem.pathId + ',' + this.data.id; |
| } |
| }; |
| @@ -105,7 +134,7 @@ cr.define('options', function() { |
| var subnodes = nodesData[i]['subnodes']; |
| delete nodesData[i]['subnodes']; |
| - var item = new CertificateTreeItem(nodesData[i]); |
| + var item = new CertificateTreeFolder(nodesData[i]); |
| this.addAt(item, i); |
| for (var j = 0; j < subnodes.length; ++j) { |