1 files changed, 76 insertions, 15 deletions

diff --git a/js/field.js b/js/field.js
index 07433b2a5..6f42fe8a4 100644
--- a/js/field.js
+++ b/js/field.js
@@ -219,14 +219,14 @@ function setupEditLink(id) {
 }
 
 /* Hide input/select fields and show the text with (edit) next to it */
-function hideEditableField( container, input, action, field_id, original_value, new_value ) {
+function hideEditableField( container, input, action, field_id, original_value, new_value, hide_input ) {
     YAHOO.util.Dom.removeClass(container, 'bz_default_hidden');
     YAHOO.util.Dom.addClass(input, 'bz_default_hidden');
     YAHOO.util.Event.addListener(action, 'click', showEditableField,
                                  new Array(container, input, field_id, new_value));
     if(field_id != ""){
         YAHOO.util.Event.addListener(window, 'load', checkForChangedFieldValues,
-                        new Array(container, input, field_id, original_value));
+                        new Array(container, input, field_id, original_value, hide_input ));
     }
 }
 
@@ -255,6 +255,8 @@ function showEditableField (e, ContainerInputArray) {
         inputs.push(document.getElementById(ContainerInputArray[2]));
     } else {
         inputs = inputArea.getElementsByTagName('input');
+        if ( inputs.length == 0 )
+            inputs = inputArea.getElementsByTagName('textarea');
     }
     if ( inputs.length > 0 ) {
         // Change the first field's value to ContainerInputArray[2]
@@ -274,7 +276,7 @@ function showEditableField (e, ContainerInputArray) {
         }
         // focus on the first field, this makes it easier to edit
         inputs[0].focus();
-        if ( type == "input" ) {
+        if ( type == "input" || type == "textarea" ) {
             inputs[0].select();
         }
     }
@@ -288,7 +290,7 @@ function showEditableField (e, ContainerInputArray) {
  *
  * var e: the event
  * var ContainerInputArray: An array containing the (edit) and text area and the input being displayed
- * var ContainerInputArray[0]: the conainer that will be hidden usually shows the (edit) text
+ * var ContainerInputArray[0]: the container that will be hidden usually shows the (edit) text
  * var ContainerInputArray[1]: the input area and label that will be displayed
  * var ContainerInputArray[2]: the field that is on the page, might get changed by browser autocomplete 
  * var ContainerInputArray[3]: the original value from the page loading.
@@ -298,8 +300,11 @@ function checkForChangedFieldValues(e, ContainerInputArray ) {
     var el = document.getElementById(ContainerInputArray[2]);
     var unhide = false;
     if ( el ) {
-        if ( el.value != ContainerInputArray[3] ||
-            ( el.value == "" && el.id != "alias") ) {
+        if ( !ContainerInputArray[4]
+             && (el.value != ContainerInputArray[3]
+                 || (el.value == "" && el.id != "alias" && el.id != "qa_contact")) )
+        {
+
             unhide = true;
         }
         else {
@@ -308,7 +313,7 @@ function checkForChangedFieldValues(e, ContainerInputArray ) {
             if ( set_default ) {
                 if(set_default.checked){
                     unhide = true;
-                }              
+                }
             }
         }
     }
@@ -341,13 +346,19 @@ function showPeopleOnChange( field_id_list ) {
     }
 }
 
-function assignToDefaultOnChange(field_id_list) {
-    showPeopleOnChange( field_id_list );
-    for(var i = 0; i < field_id_list.length; i++) {
-        YAHOO.util.Event.addListener( field_id_list[i],'change', setDefaultCheckbox,
-                                      'set_default_assignee');
-        YAHOO.util.Event.addListener( field_id_list[i],'change',setDefaultCheckbox,
-                                      'set_default_qa_contact');    
+function assignToDefaultOnChange(field_id_list, default_assignee, default_qa_contact) {
+    showPeopleOnChange(field_id_list);
+    for(var i = 0, l = field_id_list.length; i < l; i++) {
+        YAHOO.util.Event.addListener(field_id_list[i], 'change', function(evt, defaults) {
+            if (document.getElementById('assigned_to').value == defaults[0]) {
+                setDefaultCheckbox(evt, 'set_default_assignee');
+            }
+            if (document.getElementById('qa_contact')
+                && document.getElementById('qa_contact').value == defaults[1])
+            {
+                setDefaultCheckbox(evt, 'set_default_qa_contact');
+            }
+        }, [default_assignee, default_qa_contact]);
     }
 }
 
@@ -444,7 +455,7 @@ function setResolutionToDuplicate(e, duplicate_or_move_bug_status) {
     YAHOO.util.Event.preventDefault(e);
 }
 
-function setDefaultCheckbox(e, field_id ) { 
+function setDefaultCheckbox(e, field_id) {
     var el = document.getElementById(field_id);
     var elLabel = document.getElementById(field_id + "_label");
     if( el && elLabel ) {
@@ -714,9 +725,11 @@ YAHOO.bugzilla.userAutocomplete = {
     },
     debug_helper : function ( ){
         /* used to help debug any errors that might happen */
+        /*
         if( typeof(console) !== 'undefined' && console != null && arguments.length > 0 ){
             console.log("debug helper info:", arguments);
         }
+        */
         return true;
     },    
     init_ds : function(){
@@ -792,3 +805,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' : '';
+        });
+    }
+}