Merge "ES6ify /gr-button/*"
diff --git a/gerrit-httpd/src/main/resources/com/google/gerrit/httpd/raw/PolyGerritIndexHtml.soy b/gerrit-httpd/src/main/resources/com/google/gerrit/httpd/raw/PolyGerritIndexHtml.soy
index 32f91f1..eed6ccc 100644
--- a/gerrit-httpd/src/main/resources/com/google/gerrit/httpd/raw/PolyGerritIndexHtml.soy
+++ b/gerrit-httpd/src/main/resources/com/google/gerrit/httpd/raw/PolyGerritIndexHtml.soy
@@ -31,6 +31,8 @@
<script>window.CANONICAL_PATH = '{$canonicalPath}';</script>{\n}
{/if}
+ <link rel="icon" type="image/x-icon" href="{$canonicalPath}/favicon.ico">{\n}
+
// SourceCodePro fonts are used in styles/fonts.css
// @see https://github.com/w3c/preload/issues/32 regarding crossorigin
<link rel="preload" href="{$staticResourcePath}/fonts/SourceCodePro-Regular.woff2" as="font" type="font/woff2" crossorigin>{\n}
diff --git a/polygerrit-ui/app/elements/shared/gr-account-link/gr-account-link.js b/polygerrit-ui/app/elements/shared/gr-account-link/gr-account-link.js
index 69beb78..b30a26c 100644
--- a/polygerrit-ui/app/elements/shared/gr-account-link/gr-account-link.js
+++ b/polygerrit-ui/app/elements/shared/gr-account-link/gr-account-link.js
@@ -29,13 +29,13 @@
Gerrit.BaseUrlBehavior,
],
- _computeOwnerLink: function(account) {
+ _computeOwnerLink(account) {
if (!account) { return; }
- var accountID = account.email || account._account_id;
+ const accountID = account.email || account._account_id;
return this.getBaseUrl() + '/q/owner:' + encodeURIComponent(accountID);
},
- _computeShowEmail: function(account) {
+ _computeShowEmail(account) {
return !!(account && !account.name);
},
});
diff --git a/polygerrit-ui/app/elements/shared/gr-account-link/gr-account-link_test.html b/polygerrit-ui/app/elements/shared/gr-account-link/gr-account-link_test.html
index 5cc0600..29d1580 100644
--- a/polygerrit-ui/app/elements/shared/gr-account-link/gr-account-link_test.html
+++ b/polygerrit-ui/app/elements/shared/gr-account-link/gr-account-link_test.html
@@ -32,21 +32,21 @@
</test-fixture>
<script>
- suite('gr-account-link tests', function() {
- var element;
+ suite('gr-account-link tests', () => {
+ let element;
- setup(function() {
+ setup(() => {
stub('gr-rest-api-interface', {
- getConfig: function() { return Promise.resolve({}); },
+ getConfig() { return Promise.resolve({}); },
});
element = fixture('basic');
});
- test('computed fields', function() {
+ test('computed fields', () => {
assert.equal(element._computeOwnerLink(
{
_account_id: 123,
- email: 'andybons+gerrit@gmail.com'
+ email: 'andybons+gerrit@gmail.com',
}),
'/q/owner:andybons%2Bgerrit%40gmail.com');
@@ -57,6 +57,5 @@
assert.equal(element._computeShowEmail({}), true);
});
-
});
</script>
diff --git a/polygerrit-ui/app/elements/shared/gr-avatar/gr-avatar.js b/polygerrit-ui/app/elements/shared/gr-avatar/gr-avatar.js
index 38e9924..166204bf 100644
--- a/polygerrit-ui/app/elements/shared/gr-avatar/gr-avatar.js
+++ b/polygerrit-ui/app/elements/shared/gr-avatar/gr-avatar.js
@@ -28,38 +28,38 @@
},
},
- created: function() {
+ created() {
this.hidden = true;
},
- attached: function() {
- this.$.restAPI.getConfig().then(function(cfg) {
- var hasAvatars = !!(cfg && cfg.plugin && cfg.plugin.has_avatars);
+ attached() {
+ this.$.restAPI.getConfig().then(cfg => {
+ const hasAvatars = !!(cfg && cfg.plugin && cfg.plugin.has_avatars);
if (hasAvatars) {
this.hidden = false;
// src needs to be set if avatar becomes visible
this._updateAvatarURL(this.account);
}
- }.bind(this));
+ });
},
- _accountChanged: function(account) {
+ _accountChanged(account) {
this._updateAvatarURL(account);
},
- _updateAvatarURL: function(account) {
+ _updateAvatarURL(account) {
if (!this.hidden && account) {
- var url = this._buildAvatarURL(this.account);
+ const url = this._buildAvatarURL(this.account);
if (url) {
this.style.backgroundImage = 'url("' + url + '")';
}
}
},
- _buildAvatarURL: function(account) {
+ _buildAvatarURL(account) {
if (!account) { return ''; }
- var avatars = account.avatars || [];
- for (var i = 0; i < avatars.length; i++) {
+ const avatars = account.avatars || [];
+ for (let i = 0; i < avatars.length; i++) {
if (avatars[i].height === this.imageSize) {
return avatars[i].url;
}
diff --git a/polygerrit-ui/app/elements/shared/gr-avatar/gr-avatar_test.html b/polygerrit-ui/app/elements/shared/gr-avatar/gr-avatar_test.html
index fd05d62..0a1ac67 100644
--- a/polygerrit-ui/app/elements/shared/gr-avatar/gr-avatar_test.html
+++ b/polygerrit-ui/app/elements/shared/gr-avatar/gr-avatar_test.html
@@ -32,20 +32,20 @@
</test-fixture>
<script>
- suite('gr-avatar tests', function() {
- var element;
+ suite('gr-avatar tests', () => {
+ let element;
- setup(function() {
+ setup(() => {
stub('gr-rest-api-interface', {
- getConfig: function() { return Promise.resolve({}); },
+ getConfig() { return Promise.resolve({}); },
});
element = fixture('basic');
});
- test('methods', function() {
+ test('methods', () => {
assert.equal(element._buildAvatarURL(
{
- _account_id: 123
+ _account_id: 123,
}),
'/accounts/123/avatar?s=16');
assert.equal(element._buildAvatarURL(
@@ -54,15 +54,15 @@
avatars: [
{
url: 'https://cdn.example.com/s12-p/photo.jpg',
- height: 12
+ height: 12,
},
{
url: 'https://cdn.example.com/s16-p/photo.jpg',
- height: 16
+ height: 16,
},
{
url: 'https://cdn.example.com/s100-p/photo.jpg',
- height: 100
+ height: 100,
},
],
}),
@@ -73,32 +73,31 @@
avatars: [
{
url: 'https://cdn.example.com/s95-p/photo.jpg',
- height: 95
+ height: 95,
},
],
}),
'/accounts/123/avatar?s=16');
});
- test('dom for existing account', function() {
+ test('dom for existing account', () => {
assert.isTrue(element.hasAttribute('hidden'),
'element not hidden initially');
element.hidden = false;
element.imageSize = 64;
element.account = {
- _account_id: 123
+ _account_id: 123,
};
assert.isFalse(element.hasAttribute('hidden'), 'element hidden');
- assert.isTrue(element.style.backgroundImage.indexOf(
- '/accounts/123/avatar?s=64') > -1);
+ assert.isTrue(
+ element.style.backgroundImage.includes('/accounts/123/avatar?s=64'));
});
- test('dom for non available account', function() {
+ test('dom for non available account', () => {
assert.isTrue(element.hasAttribute('hidden'),
'element not hidden initially');
element.account = undefined;
assert.isTrue(element.hasAttribute('hidden'), 'element not hidden');
});
-
});
</script>
