Bug 648829 - Show happy/sad menu items to all Feedback users regardless of version [r=mark.finkle]
authorJono X <jdicarlo@mozilla.com>
Mon, 11 Apr 2011 22:30:44 -0400
changeset 67890 f7a0e34308cd80f580ded151c3a10426ba3f05a8
parent 67889 7c0c0b502a11b1723b0c80867d43d1c4ca8af65e
child 67891 a18b849ec28534afc8df319cb57851f403acad77
push idunknown
push userunknown
push dateunknown
reviewersmark
bugs648829
milestone2.2a1pre
Bug 648829 - Show happy/sad menu items to all Feedback users regardless of version [r=mark.finkle]
browser/app/profile/extensions/testpilot@labs.mozilla.com/content/feedback-browser.xul
browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/interface.js
--- a/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/feedback-browser.xul
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/content/feedback-browser.xul
@@ -52,26 +52,16 @@
               image="chrome://testpilot-os/skin/feedback-smile-16x16.png"
               label = "&testpilot.happy.label;"
               oncommand="TestPilotWindowUtils.openFeedbackPage('happy');"/>
     <menuitem id="feedback-menu-sad-button"
               class="menuitem-iconic"
               image="chrome://testpilot-os/skin/feedback-frown-16x16.png"
               label = "&testpilot.sad.label;"
               oncommand="TestPilotWindowUtils.openFeedbackPage('sad');"/>
-    <menuitem id="feedback-menu-broken-button"
-              class="menuitem-iconic"
-              image="chrome://testpilot-os/skin/feedback-broken-website.png"
-              label = "&testpilot.broken.label;"
-              oncommand="TestPilotWindowUtils.openFeedbackPage('broken');"/>
-    <menuitem id="feedback-menu-idea-button"
-              class="menuitem-iconic"
-              image="chrome://testpilot-os/skin/feedback-idea.png"
-              label = "&testpilot.idea.label;"
-              oncommand="TestPilotWindowUtils.openFeedbackPage('idea');"/>
     <menuseparator/>
     <menuitem id="feedback-menu-show-studies"
               label="&testpilot.allYourStudies.label;"
               oncommand="TestPilotWindowUtils.openAllStudiesWindow();"/>
     <menuitem id="feedback-menu-enable-studies" 
               label="&testpilot.enable.label;"
               oncommand="TestPilotMenuUtils.togglePref('runStudies');"/>
   </menupopup>
--- a/browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/interface.js
+++ b/browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/interface.js
@@ -89,27 +89,16 @@ var TestPilotUIBuilder = {
       window.document.persist("nav-bar", "currentset");
       this._prefs.setBoolPref(pref, true);
       // if you don't do the following call, funny things happen.
       try {
         window.BrowserToolboxCustomizeDone(true);
       } catch (e) {
       }
     }
-
-    /* Show and hide Feedback menu items based on version -- if user is on beta channel in
-     * the final version, they get the 'broken' and 'idea' items.  Otherwise they get
-     * 'happy' and 'sad'.*/
-    if (this.isBetaChannel() && this.appVersionIsFinal()) {
-      window.document.getElementById("feedback-menu-happy-button").setAttribute("hidden", "true");
-      window.document.getElementById("feedback-menu-sad-button").setAttribute("hidden", "true");
-    } else {
-      window.document.getElementById("feedback-menu-broken-button").setAttribute("hidden", "true");
-      window.document.getElementById("feedback-menu-idea-button").setAttribute("hidden", "true");
-    }
   },
 
   isBetaChannel: function() {
     // Beta and aurora channels use feedback interface; nightly and release channels don't.
     let channel = this._prefs.getCharPref(UPDATE_CHANNEL_PREF);
     return (channel == "beta") || (channel == "betatest") || (channel == "aurora");
   },