From e48411401d32c7c5a50f6fdfa9b4ab4369142448 Mon Sep 17 00:00:00 2001 From: Dylan William Hardison Date: Tue, 22 Aug 2017 07:53:20 -0400 Subject: Revert "Bug 1390225 - Make general/untriaged component as default, if available" This reverts commit 293b657da11e7197e90f260dc3e0c118cba126dd. --- extensions/BugModal/web/new_bug.css | 9 --------- extensions/BugModal/web/new_bug.js | 30 +++++++----------------------- 2 files changed, 7 insertions(+), 32 deletions(-) (limited to 'extensions/BugModal') diff --git a/extensions/BugModal/web/new_bug.css b/extensions/BugModal/web/new_bug.css index 9264d9b38..8a161bb9a 100644 --- 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 f3551f5c8..7298b1d20 100644 --- 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()]); -- cgit v1.2.3-24-g4f1b