Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Using Google Feedback when there is no Feedback link provided. #342

Merged
merged 5 commits into from
Sep 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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}