From 2e6693f7c4b0c0375b460d949409f28e6ca8bb8d Mon Sep 17 00:00:00 2001
From: "blakeross%telocity.com" <blakeross%telocity.com>
Date: Wed, 31 Jan 2001 02:30:53 +0000
Subject: [PATCH] Fix 66813: removing redundant methods from bindings that
 obtain them by extending the bindings for related widgets. r=timeless
 sr=alecf

---
 .../resources/content/autocomplete.xml        | 22 +-----------------
 xpfe/global/resources/content/xulBindings.xml | 23 ++-----------------
 2 files changed, 3 insertions(+), 42 deletions(-)
diff --git a/xpfe/components/autocomplete/resources/content/autocomplete.xml b/xpfe/components/autocomplete/resources/content/autocomplete.xml
index 869a5567c99..afc1af02bd5 100644
--- a/xpfe/components/autocomplete/resources/content/autocomplete.xml
+++ b/xpfe/components/autocomplete/resources/content/autocomplete.xml
@@ -18,7 +18,7 @@
             </xul:popupset>
         </xul:box>
       <xul:popupset>
-        <xul:popup oncreate="this.parentNode.parentNode.doPopupItemEnabling(this);">
+        <xul:popup oncreate="this.parentNode.parentNode.doPopupItemEnabling(this); this.focus();">
           <xul:menuitem value="&undoCmd.label;" accesskey="&undoCmd.accesskey;" command="cmd_undo" oncommand="
             var controller = document.commandDispatcher.getControllerForCommand('cmd_undo');              
             controller.doCommand('cmd_undo');"/>
@@ -44,26 +44,6 @@
     </content>
 
     <implementation>
-      <method name="doPopupItemEnabling">
-        <parameter name="popupNode"/> 
-        <body>
-          <![CDATA[
-            var children = popupNode.childNodes;
-            for (var i = 0; i < children.length; i++) {              
-              var command = children[i].getAttribute("command");
-              if (command) {
-                var controller = document.commandDispatcher.getControllerForCommand(command);
-                var enabled = controller.isCommandEnabled(command);
-                if (enabled)
-                  children[i].removeAttribute('disabled');
-                else
-                  children[i].setAttribute('disabled','true');                           
-              }
-            }
-          ]]>
-        </body>
-      </method>
-
         <property name="value"
             onset="
               if (this.ignoreInputEventTimer)
diff --git a/xpfe/global/resources/content/xulBindings.xml b/xpfe/global/resources/content/xulBindings.xml
index cad21b9e62f..8c0076b42a2 100644
--- a/xpfe/global/resources/content/xulBindings.xml
+++ b/xpfe/global/resources/content/xulBindings.xml
@@ -239,7 +239,7 @@
         <html:input class="textfield-input" flex="1" inherits="onfocus,onblur,value,type,maxlength,disabled,size,readonly"/>
       </xul:box>
       <xul:popupset>
-        <xul:popup oncreate="this.parentNode.parentNode.doPopupItemEnabling(this);">
+        <xul:popup oncreate="this.parentNode.parentNode.doPopupItemEnabling(this); this.focus();">
           <xul:menuitem value="&undoCmd.label;" accesskey="&undoCmd.accesskey;" command="cmd_undo" oncommand="
             var controller = document.commandDispatcher.getControllerForCommand('cmd_undo');              
             controller.doCommand('cmd_undo');"/>
@@ -375,7 +375,7 @@
         <html:textarea class="textfield-textarea" flex="1" inherits="onfocus,onblur,value,disabled,rows,cols,readonly"/>
       </xul:box>
       <xul:popupset>
-        <xul:popup oncreate="this.parentNode.parentNode.doPopupItemEnabling(this);">
+        <xul:popup oncreate="this.parentNode.parentNode.doPopupItemEnabling(this); this.focus();">
           <xul:menuitem value="&undoCmd.label;" accesskey="&undoCmd.accesskey;" command="cmd_undo" oncommand="
             var controller = document.commandDispatcher.getControllerForCommand('cmd_undo');              
             controller.doCommand('cmd_undo');"/>
@@ -416,25 +416,6 @@
         input;
       ]]>
       </property>
-      <method name="doPopupItemEnabling">
-        <parameter name="popupNode"/> 
-        <body>
-          <![CDATA[
-            var children = popupNode.childNodes;
-            for (var i = 0; i < children.length; i++) {              
-              var command = children[i].getAttribute("command");
-              if (command) {
-                var controller = document.commandDispatcher.getControllerForCommand(command);
-                var enabled = controller.isCommandEnabled(command);
-                if (enabled)
-                  children[i].removeAttribute('disabled');
-                else
-                  children[i].setAttribute('disabled','true');               
-              }
-            }
-          ]]>
-        </body>
-      </method>
     </implementation>
   </binding>
 
