Revert "Bug 1390225 - Make general/untriaged component as default, if available"

This reverts commit 293b657da11e7197e90f260dc3e0c118cba126dd.

diff --git a/extensions/BugModal/web/new_bug.css b/extensions/BugModal/web/new_bug.css
index 9264d9b385c565c6d971414bc4ee9346728c3961..8a161bb9ac01fd77fd404cee811b16f59b9c6bc3 100644 (file)
--- a/extensions/BugModal/web/new_bug.css
+++ b/extensions/BugModal/web/new_bug.css
@@ -49,12 +49,3 @@
 .file-container {
     padding: 8px;
 }
-
-#comp_change {
-    float: right;
-    display: none;
-}
-
-#component_wrap {
-    display: inline-block;
-}

diff --git a/extensions/BugModal/web/new_bug.js b/extensions/BugModal/web/new_bug.js
index f3551f5c8e2c73bbbbb74aa4670b2b0569752bae..7298b1d20730f071f33a0021dd1410fed47572c2 100644 (file)
--- a/extensions/BugModal/web/new_bug.js
+++ b/extensions/BugModal/web/new_bug.js
@@ -13,32 +13,22 @@ var component_load = function(product) {
             $('#product-throbber').hide();
             $('#component').attr('disabled', false);
             $('#comp_desc').text('Select a component to read its description.');
-            var selectize = $("#version")[0].selectize;
+            var selectize = $("#component")[0].selectize;
             selectize.clear();
             selectize.clearOptions();
             selectize.load(function(callback) {
-                callback(data.versions);
+                callback(data.components)
             });
 
-            selectize = $("#component")[0].selectize;
+            for (var i in data.components)
+                comp_desc[data.components[i]["name"]] = data.components[i]["description"];
+
+            selectize = $("#version")[0].selectize;
             selectize.clear();
             selectize.clearOptions();
             selectize.load(function(callback) {
-                callback(data.components)
+                callback(data.versions);
             });
-            selectize.enable();
-            $('#comp_change').css('display', 'none');
-
-            for (component in data.components) {
-                if (data.components[component].name.toLowerCase() === "untriaged" || data.components[component].name.toLowerCase() === "general") {
-                    selectize.setValue(data.components[component].name, false);
-                    selectize.disable();
-                    $('#comp_change').css('display', 'inline-block');
-                }
-            }
-
-            for (var i in data.components)
-                comp_desc[data.components[i]["name"]] = data.components[i]["description"];
         },
         function() {
             alert("Network issues. Please refresh the page and try again");
@@ -116,12 +106,6 @@ $(document).ready(function() {
         component_load($("#product").val());
     });
 
-    $('#comp_change').on("click", function () {
-        selectize = $("#component")[0].selectize;
-        selectize.enable();
-        $('#comp_change').css('display', 'none');
-    })
-
     component_sel.on("change", function () {
         var selectize = $("#component")[0].selectize;
         $('#comp_desc').text(comp_desc[selectize.getValue()]);

diff --git a/template/en/default/bug/new_bug.html.tmpl b/template/en/default/bug/new_bug.html.tmpl
index 631b9e6d57a1f4f5ddf70c593d7d2f95a43db6da..bed0c5578731dee528ab38704b4410bf217c8ddf 100644 (file)
--- a/template/en/default/bug/new_bug.html.tmpl
+++ b/template/en/default/bug/new_bug.html.tmpl
@@ -122,7 +122,6 @@
             [% END %]
 
             [%# component %]
-            <div id="component_wrap" style="display:inline-block">
             [% WRAPPER bug_modal/field.html.tmpl
                 field      = bug_fields.component
                 field_type = constants.FIELD_TYPE_SINGLE_SELECT
@@ -145,10 +144,6 @@
                 </div>
               </span>
             [% END %]
-            </div>
-            <div id="comp_change">
-              <sup><a>Change</a></sup>
-            </div>
 
             [% INCLUDE bug_modal/field.html.tmpl
               field = bug_fields.version