Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backing out bug 298894

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@175221 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mozilla.mano%sent.com
2005-06-28 15:42:22 +00:00
parent b36c64846c
commit e2e9b68edd
6 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mozilla/layout/xul/base/src/nsButtonBoxFrame.cpp
View File

@@ -48,7 +48,6 @@
#include "nsPresContext.h"
#include "nsIPresShell.h"
#include "nsGUIEvent.h"
#include "nsIDOMEvent.h"
#include "nsIEventStateManager.h"
#include "nsXULAtoms.h"
#include "nsIDOMElement.h"
@@ -113,8 +112,6 @@ nsButtonBoxFrame::HandleEvent(nsPresContext* aPresContext,
}
break;
// On mac, Return fires the defualt button, not the focused one.
#ifndef XP_MACOSX
case NS_KEY_PRESS:
if (NS_KEY_EVENT == aEvent->eventStructType) {
nsKeyEvent* keyEvent = (nsKeyEvent*)aEvent;
@@ -122,12 +119,10 @@ nsButtonBoxFrame::HandleEvent(nsPresContext* aPresContext,
nsCOMPtr<nsIDOMXULButtonElement> buttonEl(do_QueryInterface(mContent));
if (buttonEl) {
MouseClicked(aPresContext, aEvent);
aEvent->PreventDefault();
}
}
}
break;
#endif
case NS_KEY_UP:
if (NS_KEY_EVENT == aEvent->eventStructType) {

3
mozilla/toolkit/content/widgets/button.xml
View File

@@ -170,6 +170,9 @@
this.fireAccessKeyButton(buttonBox, charPressedLower);
]]>
</handler>
<handler event="keypress" keycode="VK_RETURN" preventdefault="true"/>
<handler event="keypress" keycode="VK_ENTER" preventdefault="true"/>
</handlers>
</binding>

9
mozilla/toolkit/content/widgets/dialog.xml
View File

@@ -47,6 +47,13 @@
if (!document.documentElement.cancelDialog())
event.preventDefault();
})</field>
<field name="enterDefaultAlways">
#ifdef XP_MACOSX
true
#else
false
#endif
</field>
<property name="buttons"
onget="return this.getAttribute('buttons');"
@@ -394,7 +401,7 @@
<parameter name="evt"/>
<body>
<![CDATA[
if (evt.getPreventDefault())
if (!this.enterDefaultAlways && evt.getPreventDefault())
return;
var btn = this.getButton(this.defaultButton);

3
mozilla/xpfe/global/resources/content/bindings/button.xml
View File

@@ -182,6 +182,9 @@
this.fireAccessKeyButton(buttonBox, charPressedLower);
]]>
</handler>
<handler event="keypress" keycode="VK_RETURN" preventdefault="true"/>
<handler event="keypress" keycode="VK_ENTER" preventdefault="true"/>
</handlers>
</binding>

3
mozilla/xpfe/global/resources/content/bindings/dialog.xml
View File

@@ -35,6 +35,7 @@
if (!document.documentElement.cancelDialog())
event.preventDefault();
})</field>
<field name="enterDefaultAlways">false</field>
<property name="buttons"
onget="return this.getAttribute('buttons');"
@@ -286,7 +287,7 @@
<parameter name="evt"/>
<body>
<![CDATA[
if (evt.getPreventDefault())
if (!this.enterDefaultAlways && evt.getPreventDefault())
return;
// only accept dialog if accept button is the default

4
mozilla/xpfe/global/resources/content/mac/platformDialog.xml
View File

@@ -23,6 +23,10 @@
</xul:hbox>
</content>
<implementation>
<field name="enterDefaultAlways">true</field>
</implementation>
<handlers>
<handler event="keypress" key="." modifiers="meta" phase="capturing" action="this.cancelDialog();"/>
</handlers>