Merge branch 'stable-3.0'

Change-Id: I2b520e1cc86d7a42db4410355283a87fa6e725b8
This commit is contained in:
Gert van Dijk
2019-09-25 11:58:41 +02:00
2 changed files with 10 additions and 15 deletions

View File

@@ -198,12 +198,13 @@ limitations under the License.
<gr-endpoint-decorator name="footer-left"></gr-endpoint-decorator>
</div>
<div>
<a class="feedback"
href$="[[_feedbackUrl]]"
rel="noopener"
target="_blank"
hidden$="[[!_showFeedbackUrl(_feedbackUrl)]]">Report bug</a>
| Press &ldquo;?&rdquo; for keyboard shortcuts
<template is="dom-if" if="[[_feedbackUrl]]">
<a class="feedback"
href$="[[_feedbackUrl]]"
rel="noopener"
target="_blank">Report bug</a> |
</template>
Press &ldquo;?&rdquo; for keyboard shortcuts
<gr-endpoint-decorator name="footer-right"></gr-endpoint-decorator>
</div>
</footer>

View File

@@ -435,7 +435,9 @@
if (window.VERSION_INFO) {
console.log(`UI Version Info: ${window.VERSION_INFO}`);
}
console.log(`Please file bugs and feedback at: ${this._feedbackUrl}`);
if (this._feedbackUrl) {
console.log(`Please file bugs and feedback at: ${this._feedbackUrl}`);
}
console.groupEnd();
},
@@ -453,14 +455,6 @@
this.mobileSearch = !this.mobileSearch;
},
_showFeedbackUrl(feedbackUrl) {
if (feedbackUrl) {
return feedbackUrl;
}
return false;
},
getThemeEndpoint() {
// For now, we only have dark mode and light mode
return window.localStorage.getItem('dark-theme') ?