From e1e2ca422db2ad5c4a19c0901b6402d3a7f0b175 Mon Sep 17 00:00:00 2001 From: Byron Jones Date: Wed, 3 Sep 2014 14:06:29 +0800 Subject: Bug 1054138: add the ability to filter on "fields containing the string" --- extensions/BugmailFilter/web/js/bugmail-filter.js | 36 +++++++++++++++++------ 1 file changed, 27 insertions(+), 9 deletions(-) (limited to 'extensions/BugmailFilter/web/js') diff --git a/extensions/BugmailFilter/web/js/bugmail-filter.js b/extensions/BugmailFilter/web/js/bugmail-filter.js index 2b320bbbb..c24528861 100644 --- a/extensions/BugmailFilter/web/js/bugmail-filter.js +++ b/extensions/BugmailFilter/web/js/bugmail-filter.js @@ -6,19 +6,33 @@ * defined by the Mozilla Public License, v. 2.0. */ var Dom = YAHOO.util.Dom; -var Event = YAHOO.util.Event; + +function onFilterFieldChange() { + if (Dom.get('field').value == '~') { + Dom.removeClass('field_contains_row', 'bz_default_hidden'); + Dom.get('field_contains').focus(); + Dom.get('field_contains').select(); + } + else { + Dom.addClass('field_contains_row', 'bz_default_hidden'); + } +} function onFilterProductChange() { selectProduct(Dom.get('product'), Dom.get('component'), null, null, '__Any__'); Dom.get('component').disabled = Dom.get('product').value == ''; } -function onFilterActionChange() { - var value = Dom.get('action').value; - Dom.get('add_filter').disabled = value == ''; +function setFilterAddEnabled() { + Dom.get('add_filter').disabled = + ( + Dom.get('field').value == '~' + && Dom.get('field_contains').value == '' + ) + || Dom.get('action').value == ''; } -function onRemoveChange() { +function onFilterRemoveChange() { var cbs = Dom.get('filters_table').getElementsByTagName('input'); for (var i = 0, l = cbs.length; i < l; i++) { if (cbs[i].checked) { @@ -34,9 +48,13 @@ function showAllFlags() { Dom.removeClass('all_flags', 'bz_default_hidden'); } -Event.onDOMReady(function() { - Event.on('action', 'change', onFilterActionChange); +YAHOO.util.Event.onDOMReady(function() { + YAHOO.util.Event.on('field', 'change', onFilterFieldChange); + YAHOO.util.Event.on('field_contains', 'keyup', setFilterAddEnabled); + YAHOO.util.Event.on('product', 'change', onFilterProductChange); + YAHOO.util.Event.on('action', 'change', setFilterAddEnabled); + onFilterFieldChange(); onFilterProductChange(); - onFilterActionChange(); - onRemoveChange(); + onFilterRemoveChange(); + setFilterAddEnabled(); }); -- cgit v1.2.3-24-g4f1b