Bug 1201902 - Add new feedback link to Loop's panel menu. r=Standard8

This commit is contained in:
David Critchley 2015-11-17 14:15:43 +00:00
parent 7f1285ea6f
commit 8f749faf68
4 changed files with 4 additions and 3 deletions

View File

@ -1405,6 +1405,7 @@ pref("loop.debug.twoWayMediaTelemetry", false);
pref("loop.feedback.dateLastSeenSec", 0); pref("loop.feedback.dateLastSeenSec", 0);
pref("loop.feedback.periodSec", 15770000); // 6 months. pref("loop.feedback.periodSec", 15770000); // 6 months.
pref("loop.feedback.formURL", "https://www.mozilla.org/firefox/hello/npssurvey/"); pref("loop.feedback.formURL", "https://www.mozilla.org/firefox/hello/npssurvey/");
pref("loop.feedback.manualFormURL", "https://www.mozilla.org/firefox/hello/feedbacksurvey/");
#ifdef DEBUG #ifdef DEBUG
pref("loop.CSP", "default-src 'self' about: file: chrome: http://localhost:*; img-src * data:; font-src 'none'; connect-src wss://*.tokbox.com https://*.opentok.com https://*.tokbox.com wss://*.mozilla.com https://*.mozilla.org wss://*.mozaws.net http://localhost:* ws://localhost:*; media-src blob:"); pref("loop.CSP", "default-src 'self' about: file: chrome: http://localhost:*; img-src * data:; font-src 'none'; connect-src wss://*.tokbox.com https://*.opentok.com https://*.tokbox.com wss://*.mozilla.com https://*.mozilla.org wss://*.mozaws.net http://localhost:* ws://localhost:*; media-src blob:");
#else #else

View File

@ -230,7 +230,7 @@ loop.panel = (function(_, mozL10n) {
*/ */
handleSubmitFeedback: function(event) { handleSubmitFeedback: function(event) {
event.preventDefault(); event.preventDefault();
var helloFeedbackUrl = this.props.mozLoop.getLoopPref("feedback.formURL"); var helloFeedbackUrl = this.props.mozLoop.getLoopPref("feedback.manualFormURL");
this.props.mozLoop.openURL(helloFeedbackUrl); this.props.mozLoop.openURL(helloFeedbackUrl);
this.closeWindow(); this.closeWindow();
}, },

View File

@ -230,7 +230,7 @@ loop.panel = (function(_, mozL10n) {
*/ */
handleSubmitFeedback: function(event) { handleSubmitFeedback: function(event) {
event.preventDefault(); event.preventDefault();
var helloFeedbackUrl = this.props.mozLoop.getLoopPref("feedback.formURL"); var helloFeedbackUrl = this.props.mozLoop.getLoopPref("feedback.manualFormURL");
this.props.mozLoop.openURL(helloFeedbackUrl); this.props.mozLoop.openURL(helloFeedbackUrl);
this.closeWindow(); this.closeWindow();
}, },

View File

@ -493,7 +493,7 @@ describe("loop.panel", function() {
beforeEach(function() { beforeEach(function() {
feedbackUrl = "https://example.com"; feedbackUrl = "https://example.com";
fakeMozLoop.getLoopPref = function(pref) { fakeMozLoop.getLoopPref = function(pref) {
if (pref === "feedback.formURL") { if (pref === "feedback.manualFormURL") {
return feedbackUrl; return feedbackUrl;
} }