Re-fix Bug 26950: Make the summary and alias fields support click-to-edit <https...

* js/field.js: Port the changes from r45538 to Bugzilla 4.2.5.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@174776 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Websites/bugs.webkit.org/js/field.js b/Websites/bugs.webkit.org/js/field.js
index 07433b2a56376bbf4c13d25c3c23e312bda547b4..d3f7616ccf2239a881ad933879e960ed49cfebba 100644 (file)
--- a/Websites/bugs.webkit.org/js/field.js
+++ b/Websites/bugs.webkit.org/js/field.js
@@ -219,15 +219,24 @@ 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_array, original_value, new_value ) {
+    var field_id = field_array instanceof Array ? field_array.shift() : field_array;
     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(field_id + '_nonedit_display', 'click', showEditableField,
+                                     new Array(container, input, undefined, undefined, field_id));
         YAHOO.util.Event.addListener(window, 'load', checkForChangedFieldValues,
                         new Array(container, input, field_id, original_value));
     }
+    for (var field2_id in field_array){
+        if(field2_id != ""){
+            YAHOO.util.Event.addListener(field2_id + '_nonedit_display', 'click', showEditableField,
+                                         new Array(container, input, undefined, undefined, field2_id));
+        }
+    }
 }
 
 /* showEditableField (e, ContainerInputArray)
@@ -239,6 +248,7 @@ function hideEditableField( container, input, action, field_id, original_value,
  * var ContainerInputArray[1]: the input area and label that will be displayed
  * var ContainerInputArray[2]: the input/select field id for which the new value must be set
  * var ContainerInputArray[3]: the new value to set the input/select field to when (take) is clicked
+ * var ContainerInputArray[4]: [optional] the id of the input element to focus
  */
 function showEditableField (e, ContainerInputArray) {
     var inputs = new Array();
@@ -272,10 +282,19 @@ function showEditableField (e, ContainerInputArray) {
                 }
             }
         }
-        // focus on the first field, this makes it easier to edit
-        inputs[0].focus();
-        if ( type == "input" ) {
-            inputs[0].select();
+        var elementToFocus = YAHOO.util.Dom.get(ContainerInputArray[4]);
+        if (elementToFocus) {
+            // focus on the requested field
+            elementToFocus.focus();
+            if ( elementToFocus.tagName.toLowerCase() == "input" ) {
+                elementToFocus.select();
+            }
+        } else {
+            // focus on the first field, this makes it easier to edit
+            inputs[0].focus();
+            if ( type == "input" ) {
+                inputs[0].select();
+            }
         }
     }
     YAHOO.util.Event.preventDefault(e);
@@ -322,7 +341,7 @@ function checkForChangedFieldValues(e, ContainerInputArray ) {
 function hideAliasAndSummary(short_desc_value, alias_value) {
     // check the short desc field
     hideEditableField( 'summary_alias_container','summary_alias_input',
-                       'editme_action','short_desc', short_desc_value);  
+                       'editme_action', new Array('short_desc', 'alias'), short_desc_value);  
     // check that the alias hasn't changed
     var bz_alias_check_array = new Array('summary_alias_container',
                                      'summary_alias_input', 'alias', alias_value);