Bug 1201902 - Add new feedback link to panel menu. r=Standard8 a=ritu
authorDavid Critchley <david@priologic.com>
Mon, 11 Jan 2016 11:35:50 -0800
changeset 306003 ad6e0f8d7bd3090eaf6cf6169c12542a9fe7dfa3
parent 306002 ce5d62493589750116c6360dc2b7823550b74b32
child 306004 3517ff00b87a27e55af244e353ef7607a0264639
push id1001
push userraliiev@mozilla.com
push dateMon, 18 Jan 2016 19:06:03 +0000
treeherdermozilla-release@8b89261f3ac4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8, ritu
bugs1201902
milestone44.0
Bug 1201902 - Add new feedback link to panel menu. r=Standard8 a=ritu
browser/app/profile/firefox.js
browser/components/loop/content/js/panel.js
browser/components/loop/content/js/panel.jsx
browser/components/loop/test/desktop-local/panel_test.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1402,16 +1402,17 @@ pref("loop.feedback.baseUrl", "https://i
 pref("loop.feedback.product", "Loop");
 pref("loop.debug.loglevel", "Error");
 pref("loop.debug.dispatcher", false);
 pref("loop.debug.sdk", false);
 pref("loop.debug.twoWayMediaTelemetry", false);
 pref("loop.feedback.dateLastSeenSec", 0);
 pref("loop.feedback.periodSec", 15770000); // 6 months.
 pref("loop.feedback.formURL", "https://www.mozilla.org/firefox/hello/npssurvey/");
+pref("loop.feedback.manualFormURL", "https://www.mozilla.org/firefox/hello/feedbacksurvey/");
 #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:");
 #else
 pref("loop.CSP", "default-src 'self' about: file: chrome:; 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; media-src blob:");
 #endif
 pref("loop.oauth.google.redirect_uri", "urn:ietf:wg:oauth:2.0:oob:auto");
 pref("loop.oauth.google.scope", "https://www.google.com/m8/feeds");
 pref("loop.fxa_oauth.tokendata", "");
--- a/browser/components/loop/content/js/panel.js
+++ b/browser/components/loop/content/js/panel.js
@@ -225,17 +225,17 @@ loop.panel = (function(_, mozL10n) {
       this.hideDropdownMenu();
     },
 
     /**
      * Load on the browser the feedback url from prefs
      */
     handleSubmitFeedback: function(event) {
       event.preventDefault();
-      var helloFeedbackUrl = this.props.mozLoop.getLoopPref("feedback.formURL");
+      var helloFeedbackUrl = this.props.mozLoop.getLoopPref("feedback.manualFormURL");
       this.props.mozLoop.openURL(helloFeedbackUrl);
       this.closeWindow();
     },
 
     _isSignedIn: function() {
       return !!this.props.mozLoop.userProfile;
     },
 
--- a/browser/components/loop/content/js/panel.jsx
+++ b/browser/components/loop/content/js/panel.jsx
@@ -225,17 +225,17 @@ loop.panel = (function(_, mozL10n) {
       this.hideDropdownMenu();
     },
 
     /**
      * Load on the browser the feedback url from prefs
      */
     handleSubmitFeedback: function(event) {
       event.preventDefault();
-      var helloFeedbackUrl = this.props.mozLoop.getLoopPref("feedback.formURL");
+      var helloFeedbackUrl = this.props.mozLoop.getLoopPref("feedback.manualFormURL");
       this.props.mozLoop.openURL(helloFeedbackUrl);
       this.closeWindow();
     },
 
     _isSignedIn: function() {
       return !!this.props.mozLoop.userProfile;
     },
 
--- a/browser/components/loop/test/desktop-local/panel_test.js
+++ b/browser/components/loop/test/desktop-local/panel_test.js
@@ -482,17 +482,17 @@ describe("loop.panel", function() {
           React.createElement(loop.panel.SettingsDropdown, {
             mozLoop: fakeMozLoop
           }));
       }
 
       beforeEach(function() {
         feedbackUrl = "https://example.com";
         fakeMozLoop.getLoopPref = function(pref) {
-          if (pref === "feedback.formURL") {
+          if (pref === "feedback.manualFormURL") {
             return feedbackUrl;
           }
 
           return "unseen";
         };
       });
 
       it("should open a tab to the feedback page", function() {