From 3700f44dcd4fddb7798619451275b05f12a99032 Mon Sep 17 00:00:00 2001 From: Byron Jones Date: Wed, 26 Sep 2012 14:32:58 +0800 Subject: Bug 437212: sync bmo code with upstream --- js/field.js | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ js/show_bug.js | 42 ------------------------------------------ js/util.js | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 97 insertions(+), 42 deletions(-) delete mode 100644 js/show_bug.js (limited to 'js') diff --git a/js/field.js b/js/field.js index ede2e43b9..a17fbbb3a 100644 --- a/js/field.js +++ b/js/field.js @@ -795,3 +795,51 @@ YAHOO.bugzilla.keywordAutocomplete = { }); } }; + +/** + * Force the browser to honour the selected option when a page is refreshed, + * but only if the user hasn't explicitly selected a different option. + */ +function initDirtyFieldTracking() { + // old IE versions don't provide the information we need to make this fix work + // however they aren't affected by this issue, so it's ok to ignore them + if (YAHOO.env.ua.ie > 0 && YAHOO.env.ua.ie <= 8) return; + var selects = document.getElementById('changeform').getElementsByTagName('select'); + for (var i = 0, l = selects.length; i < l; i++) { + var el = selects[i]; + var el_dirty = document.getElementById(el.name + '_dirty'); + if (!el_dirty) continue; + if (!el_dirty.value) { + var preSelected = bz_preselectedOptions(el); + if (!el.multiple) { + preSelected.selected = true; + } else { + el.selectedIndex = -1; + for (var j = 0, m = preSelected.length; j < m; j++) { + preSelected[j].selected = true; + } + } + } + YAHOO.util.Event.on(el, "change", function(e) { + var el = e.target || e.srcElement; + var preSelected = bz_preselectedOptions(el); + var currentSelected = bz_selectedOptions(el); + var isDirty = false; + if (!el.multiple) { + isDirty = preSelected.index != currentSelected.index; + } else { + if (preSelected.length != currentSelected.length) { + isDirty = true; + } else { + for (var i = 0, l = preSelected.length; i < l; i++) { + if (currentSelected[i].index != preSelected[i].index) { + isDirty = true; + break; + } + } + } + } + document.getElementById(el.name + '_dirty').value = isDirty ? '1' : ''; + }); + } +} diff --git a/js/show_bug.js b/js/show_bug.js deleted file mode 100644 index 07276075f..000000000 --- a/js/show_bug.js +++ /dev/null @@ -1,42 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This Source Code Form is "Incompatible With Secondary Licenses", as - * defined by the Mozilla Public License, v. 2.0. */ - -function getPreSelectedIndex(el) { - var options = el.options; - for (var i = 0, l = options.length; i < l; i++) { - var attributes = options[i].attributes; - for (var j = 0, m = attributes.length; j < m; j++) { - if (attributes[j].name == 'selected') { - return i; - } - } - } - return -1; -} - -// Force the browser to honour the selected option when a page is refreshed, -// but if the user hasn't explicitly selected a different option. -YAHOO.util.Event.onDOMReady(function() { - var selects = document.getElementById('changeform').getElementsByTagName('select'); - for (var i = 0, l = selects.length; i < l; i++) { - var el = selects[i]; - var el_dirty = document.getElementById(el.name + '_dirty'); - if (el_dirty) { - if (!el_dirty.value) { - var preSelectedIndex = getPreSelectedIndex(el); - if (preSelectedIndex != -1) - el.selectedIndex = preselectedIndex; - } - YAHOO.util.Event.on(el, "change", function(e) { - var el = e.target || e.srcElement; - var preSelectedIndex = getPreSelectedIndex(el); - if (preSelectedIndex != -1) - document.getElementById(el.name + '_dirty').value = preSelectedIndex == el.selectedIndex ? '' : '1'; - }); - } - } -}); diff --git a/js/util.js b/js/util.js index 6dcabbbc9..e0e87259f 100644 --- a/js/util.js +++ b/js/util.js @@ -201,6 +201,55 @@ function bz_populateSelectFromArray(aSelect, aArray) { } } +/** + * Returns all Option elements that are selected in a