Refactor and fix feedback

chrome/browser/resources/feedback.js

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Constants.
 var FEEDBACK_LANDING_PAGE =
     'http://www.google.com/support/chrome/go/feedback_confirmation'
 
 var selectedThumbnailDivId = '';
 var selectedThumbnailId = '';
 var selectedImageUrl;
 
 var savedThumbnailIds = [];
 savedThumbnailIds['current-screenshots'] = '';
 savedThumbnailIds['saved-screenshots'] = '';
 
+var categoryTag = "";
+
 var localStrings = new LocalStrings();
 
 /**
  * Selects an image thumbnail in the specified div.
  */
 function selectImage(divId, thumbnailId) {
   var thumbnailDivs = $(divId).children;
   selectedThumbnailDivId = divId;
   if (thumbnailDivs.length == 0) {
     $(divId).style.display = 'none';
@@ skipping 43 matching lines @@
   if (!selectedThumbnailId)
     selectImage(divId, thumbnailDiv.id);
 }
 
 /**
  * Send's the report; after the report is sent, we need to be redirected to
  * the landing page, but we shouldn't be able to navigate back, hence
  * we open the landing page in a new tab and sendReport closes this tab.
  */
 function sendReport() {
-  if (!$('issue-with-combo').selectedIndex) {
-    alert(localStrings.getString('no-issue-selected'));
-    return false;
-  } else if ($('description-text').value.length == 0) {
+  if ($('description-text').value.length == 0) {
     alert(localStrings.getString('no-description'));
     return false;
   }
 
   var imagePath = '';
   if ($('screenshot-checkbox').checked && selectedThumbnailId)
     imagePath = $(selectedThumbnailId + '-image').src;
   var pageUrl = $('page-url-text').value;
   if (!$('page-url-checkbox').checked)
     pageUrl = '';
 
-  // Note, categories are based from 1 in our protocol buffers, so no
-  // adjustment is needed on selectedIndex.
-  var reportArray = [String($('issue-with-combo').selectedIndex),
-                     pageUrl,
+  var reportArray = [pageUrl,
+                     categoryTag,
                      $('description-text').value,
                      imagePath];
 
   // Add chromeos data if it exists.
   if ($('user-email-text') && $('sys-info-checkbox')) {
     var userEmail= $('user-email-text').textContent;
     if (!$('user-email-checkbox').checked)
       userEmail = '';
     reportArray = reportArray.concat([userEmail,
                                       String($('sys-info-checkbox').checked)]);
@@ skipping 97 matching lines @@
   $('cancel-button').onclick = cancel;
 
   var menuOffPattern = /(^\?|&)menu=off($|&)/;
   var menuDisabled = menuOffPattern.test(window.location.search);
   document.documentElement.setAttribute('hide-menu', menuDisabled);
 
   // Set default values for the possible parameters, and then parse the actual
   // values from the URL hash.
   var parameters = {
     'description': '',
-    'issueType': 0,
+    'categoryTag': '',
   };
   var queryPos = window.location.hash.indexOf('?');
   if (queryPos !== -1) {
     // Get an array of parameters in 'name=value' form.
     var query = window.location.hash.substring(queryPos + 1).split('&');
     for (var i = 0; i < query.length; i++) {
       // Decode and store each parameter value.
       parameter = query[i].split('=');
       parameters[parameter[0]] = decodeURIComponent(parameter[1]);
     }
 
     // For a clean URL, trim the parameters from the hash.
     window.location.hash = window.location.hash.substring(0, queryPos);
   }
 
   // Set the initial description text.
   $('description-text').textContent = parameters['description'];
 
-  // Get a list of issues that we allow the user to select from.
-  // Note, the order and the issues types themselves are different
-  // between Chromium and Chromium OS, so this code needs to be
-  // maintained individually between in these two sections.
-  var issueTypeText = [];
-  issueTypeText[0] = localStrings.getString('issue-choose');
-<if expr="not pp_ifdef('chromeos')">
-  issueTypeText[1] = localStrings.getString('issue-page-formatting');
-  issueTypeText[2] = localStrings.getString('issue-page-load');
-  issueTypeText[3] = localStrings.getString('issue-plugins');
-  issueTypeText[4] = localStrings.getString('issue-tabs');
-  issueTypeText[5] = localStrings.getString('issue-sync');
-  issueTypeText[6] = localStrings.getString('issue-crashes');
-  issueTypeText[7] = localStrings.getString('issue-extensions');
-  issueTypeText[8] = localStrings.getString('issue-phishing');
-  issueTypeText[9] = localStrings.getString('issue-other');
-  var numDefaultIssues = issueTypeText.length;
-  issueTypeText[10] = localStrings.getString('issue-autofill');
-</if>
-<if expr="pp_ifdef('chromeos')">
-  issueTypeText[1] = localStrings.getString('issue-connectivity');
-  issueTypeText[2] = localStrings.getString('issue-sync');
-  issueTypeText[3] = localStrings.getString('issue-crashes');
-  issueTypeText[4] = localStrings.getString('issue-page-formatting');
-  issueTypeText[5] = localStrings.getString('issue-extensions');
-  issueTypeText[6] = localStrings.getString('issue-standby');
-  issueTypeText[7] = localStrings.getString('issue-phishing');
-  issueTypeText[8] = localStrings.getString('issue-other');
-  var numDefaultIssues = issueTypeText.length;
-  issueTypeText[9] = localStrings.getString('issue-autofill');
-</if>
-  // Add all the issues to the selection box.
-  for (var i = 0; i < issueTypeText.length; i++) {
-    var option = document.createElement('option');
-    option.className = 'bug-report-text';
-    option.textContent = issueTypeText[i];
-    if (('' + i) === parameters['issueType'])
-      option.selected = true;
-
-    if (i < numDefaultIssues || option.selected)
-      $('issue-with-combo').add(option);
-  }
+  // Pick up the category tag (for most cases this will be an empty string)
+  categoryTag = parameters['categoryTag'];
 
   chrome.send('getDialogDefaults', []);
   chrome.send('refreshCurrentScreenshot', []);
 };
 
 function setupCurrentScreenshot(screenshot) {
   addScreenshot('current-screenshots', screenshot);
 }
 
 function setupSavedScreenshots(screenshots) {
@@ skipping 33 matching lines @@
         $('user-email-table').style.display = 'none';
 
         // this also means we are in privacy mode, so no saved screenshots.
         $('screenshot-link-tosaved').style.display = 'none';
       }
     }
   }
 }
 
 window.addEventListener('DOMContentLoaded', load);