| Index: remoting/webapp/app_remoting/js/feedback_consent.js
|
| diff --git a/remoting/webapp/app_remoting/js/feedback_consent.js b/remoting/webapp/app_remoting/js/feedback_consent.js
|
| index 1437d057c1a8b7ecd0898c58ca79edb7dfcc1427..ef9a0ec218bab714cbda3928bdd2ce514d198152 100644
|
| --- a/remoting/webapp/app_remoting/js/feedback_consent.js
|
| +++ b/remoting/webapp/app_remoting/js/feedback_consent.js
|
| @@ -35,6 +35,12 @@ var applicationWindow = null;
|
| var crashServiceReportId = '';
|
|
|
| /**
|
| + * @type {string} The user-selected feedback category, represented by its
|
| + * l10n tag.
|
| + */
|
| +var selectedCategory = '';
|
| +
|
| +/**
|
| * @param {string} email
|
| * @param {string} realName
|
| */
|
| @@ -59,7 +65,8 @@ function onUserInfo(email, realName) {
|
| '&psd_hostId=' + escape(hostId) +
|
| '&psd_abandonHost=' + escape(abandonHost) +
|
| '&psd_crashServiceReportId=' + escape(crashServiceReportId) +
|
| - '&psd_connectionStats=' + escape(connectionStats));
|
| + '&psd_connectionStats=' + escape(connectionStats) +
|
| + '&psd_category=' + escape(selectedCategory));
|
| window.close();
|
|
|
| // If the VM was successfully abandoned, close the application.
|
| @@ -94,7 +101,7 @@ function showError() {
|
| abandonHost = 'failed';
|
| crashServiceReportId = '';
|
| formBody.hidden = true;
|
| - resizeWindow();
|
| + base.resizeWindowToContent(true);
|
| }
|
|
|
| /**
|
| @@ -191,12 +198,20 @@ function onLearnMore(event) {
|
| var learnMoreInfobox = document.getElementById('privacy-info');
|
| learnMoreLink.hidden = true;
|
| learnMoreInfobox.hidden = false;
|
| - resizeWindow();
|
| + base.resizeWindowToContent(true);
|
| }
|
|
|
| -function resizeWindow() {
|
| - var borderY = window.outerHeight - window.innerHeight;
|
| - window.resizeTo(window.outerWidth, document.body.clientHeight + borderY);
|
| +function onCategorySelect() {
|
| + var feedbackCategory = /** @type {HTMLSelectElement} */
|
| + (document.getElementById('feedback-category'));
|
| + base.debug.assert(feedbackCategory.selectedOptions.length == 1);
|
| + var selectedOption = /** @type {HTMLElement} */
|
| + (feedbackCategory.selectedOptions[0]);
|
| + selectedCategory = selectedOption.getAttribute('i18n-content');
|
| + var selected = selectedCategory != 'FEEDBACK_CATEGORY_SELECT';
|
| + document.getElementById('feedback-consent-ok').disabled = !selected;
|
| + document.getElementById('form-body').hidden = !selected;
|
| + base.resizeWindowToContent(false);
|
| }
|
|
|
| function onLoad() {
|
| @@ -208,12 +223,14 @@ function onLoad() {
|
| var abandon = document.getElementById('abandon-host-label');
|
| var includeLogs = document.getElementById('include-logs-label');
|
| var learnMoreLink = document.getElementById('learn-more');
|
| + var feedbackCategory = document.getElementById('feedback-category');
|
| ok.addEventListener('click', onOk, false);
|
| cancel.addEventListener('click', onCancel, false);
|
| abandon.addEventListener('click', onToggleAbandon, false);
|
| includeLogs.addEventListener('click', onToggleLogs, false);
|
| learnMoreLink.addEventListener('click', onLearnMore, false);
|
| - resizeWindow();
|
| + feedbackCategory.addEventListener('change', onCategorySelect, false);
|
| + base.resizeWindowToContent(true);
|
| }
|
|
|
| /** @param {Event} event */
|
|
|