Partial fix for 17848. Part 1 of 2. 2nd part will be checked in by hangas. r=hangas, a=brendan

content/xul/document/public/nsIController.idl

@@ -27,4 +27,6 @@ interface nsIController : nsISupports {
 	boolean supportsCommand(in wstring command);
 
 	void doCommand(in wstring command);
+
+	void onEvent(in wstring eventName);
 };

content/xul/document/src/nsXULCommandDispatcher.cpp

@@ -207,8 +207,11 @@ XULCommandDispatcherImpl::GetFocusedNode(nsIDOMNode** aNode)
 NS_IMETHODIMP
 XULCommandDispatcherImpl::SetFocusedNode(nsIDOMNode* aNode)
 {
+  // XXX On a blur, will need to fire an updatecommands (focus) on the
+  // parent window.
   mCurrentNode = aNode;
-  UpdateCommands(nsAutoString(aNode ? "focus" : "blur"));
+  if (mCurrentNode)
+    UpdateCommands(nsAutoString("focus"));
   return NS_OK;
 }
 

rdf/base/idl/nsIController.idl

@@ -27,4 +27,6 @@ interface nsIController : nsISupports {
 	boolean supportsCommand(in wstring command);
 
 	void doCommand(in wstring command);
+
+	void onEvent(in wstring eventName);
 };

rdf/content/src/nsXULCommandDispatcher.cpp

@@ -207,8 +207,11 @@ XULCommandDispatcherImpl::GetFocusedNode(nsIDOMNode** aNode)
 NS_IMETHODIMP
 XULCommandDispatcherImpl::SetFocusedNode(nsIDOMNode* aNode)
 {
+  // XXX On a blur, will need to fire an updatecommands (focus) on the
+  // parent window.
   mCurrentNode = aNode;
-  UpdateCommands(nsAutoString(aNode ? "focus" : "blur"));
+  if (mCurrentNode)
+    UpdateCommands(nsAutoString("focus"));
   return NS_OK;
 }