Skip to content

Commit

Permalink
Merge pull request googlecodelabs#342 from googlecodelabs/google-feed…
Browse files Browse the repository at this point in the history
…back

Using Google Feedback when there is no Feedback link provided.
  • Loading branch information
Nicolas Garnier authored Sep 4, 2019
2 parents b4d6882 + c3fda35 commit 5b0838c
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 5 deletions.
1 change: 1 addition & 0 deletions claat/render/template.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
<script src="{{.Prefix}}/codelab-elements/custom-elements.min.js"></script>
<script src="{{.Prefix}}/codelab-elements/prettify.js"></script>
<script src="{{.Prefix}}/codelab-elements/codelab-elements.js"></script>
<script src="//support.google.com/inapp/api.js"></script>

</body>
</html>
2 changes: 1 addition & 1 deletion codelab-elements/google-codelab/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ closure_js_library(
name = "google_codelab",
srcs = [
"google_codelab.js",
"google_codelab_def.js"
"google_codelab_def.js",
],
deps = [
"@io_bazel_rules_closure//closure/library",
Expand Down
12 changes: 12 additions & 0 deletions codelab-elements/google-codelab/google_codelab.js
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,7 @@ class Codelab extends HTMLElement {
return;
}


let time = 0;
for (let i = this.currentSelectedStep_; i < this.steps_.length; i++) {
const step = /** @type {!Element} */ (this.steps_[i]);
Expand Down Expand Up @@ -747,6 +748,17 @@ class Codelab extends HTMLElement {
const feedback = this.getAttribute(FEEDBACK_LINK_ATTR);
const steps = this.steps_.map((step) => step.getAttribute(LABEL_ATTR));
soy.renderElement(this.drawer_, Templates.drawer, {steps, feedback});
// Start Google Feedback when the feedback link is clicked, if it exists.
const feedbackLink = this.drawer_.querySelector('#codelab-feedback');
if (feedbackLink) {
this.eventHandler_.listen(feedbackLink, events.EventType.CLICK,
(e) => {
if ('userfeedback' in window) {
window['userfeedback']['api']['startFeedback']
({productId: '5143948'});
}
});
}
}

/**
Expand Down
6 changes: 2 additions & 4 deletions codelab-elements/google-codelab/google_codelab.soy
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,9 @@
{/for}
</ol>
</div>
{if $feedback}
<div id="feedback" class="metadata">
<a target="_blank" href="{$feedback}">
<div class="metadata">
<a target="_blank" {if $feedback}href="{$feedback}"{else}href="#" id="codelab-feedback"{/if}>
<i class="material-icons">bug_report</i> Report a mistake
</a>
</div>
{/if}
{/template}

0 comments on commit 5b0838c

Please sign in to comment.