зеркало из https://github.com/mozilla/pjs.git
Backing out bug 407359 because of orange
This commit is contained in:
Родитель
268333d927
Коммит
e354d456cf
|
@ -52,12 +52,6 @@ interface nsIAccessibleProvider : nsISupports
|
|||
* Constants set of common use.
|
||||
*/
|
||||
|
||||
/** Do not create an accessible for this object
|
||||
* This is useful if an ancestor binding already implements nsIAccessibleProvider,
|
||||
* but no accessible is desired for the inheriting binding
|
||||
*/
|
||||
const long NoAccessible = 0;
|
||||
|
||||
/** For elements that spawn a new document. For example now it is used by
|
||||
<xul:iframe>, <xul:browser> and <xul:editor>. */
|
||||
const long OuterDoc = 0x00000001;
|
||||
|
@ -84,33 +78,32 @@ interface nsIAccessibleProvider : nsISupports
|
|||
const long XULMenuitem = 0x0000100E;
|
||||
const long XULMenupopup = 0x0000100F;
|
||||
const long XULMenuSeparator = 0x00001010;
|
||||
const long XULPane = 0x00001011;
|
||||
const long XULProgressMeter = 0x00001012;
|
||||
const long XULScale = 0x00001013;
|
||||
const long XULStatusBar = 0x00001014;
|
||||
const long XULRadioButton = 0x00001015;
|
||||
const long XULRadioGroup = 0x00001016;
|
||||
const long XULProgressMeter = 0x00001011;
|
||||
const long XULScale = 0x00001012;
|
||||
const long XULStatusBar = 0x00001013;
|
||||
const long XULRadioButton = 0x00001014;
|
||||
const long XULRadioGroup = 0x00001015;
|
||||
|
||||
/** The single tab in a dialog or tabbrowser/editor interface */
|
||||
const long XULTab = 0x00001017;
|
||||
const long XULTab = 0x00001016;
|
||||
|
||||
/** A combination of a tabs object and a tabpanels object */
|
||||
const long XULTabBox = 0x00001018;
|
||||
const long XULTabBox = 0x00001017;
|
||||
|
||||
/** The collection of tab objects, useable in the TabBox and independant of
|
||||
as well */
|
||||
const long XULTabs = 0x00001019;
|
||||
const long XULTabs = 0x00001018;
|
||||
|
||||
const long XULText = 0x0000101A;
|
||||
const long XULTextBox = 0x0000101B;
|
||||
const long XULThumb = 0x0000101C;
|
||||
const long XULTree = 0x0000101D;
|
||||
const long XULTreeColumns = 0x0000101E;
|
||||
const long XULTreeColumnItem = 0x0000101F;
|
||||
const long XULToolbar = 0x00001020;
|
||||
const long XULToolbarSeparator = 0x00001021;
|
||||
const long XULTooltip = 0x00001022;
|
||||
const long XULToolbarButton = 0x00001023;
|
||||
const long XULText = 0x00001019;
|
||||
const long XULTextBox = 0x0000101A;
|
||||
const long XULThumb = 0x0000101B;
|
||||
const long XULTree = 0x0000101C;
|
||||
const long XULTreeColumns = 0x0000101D;
|
||||
const long XULTreeColumnItem = 0x0000101E;
|
||||
const long XULToolbar = 0x0000101F;
|
||||
const long XULToolbarSeparator = 0x00001020;
|
||||
const long XULTooltip = 0x00001021;
|
||||
const long XULToolbarButton = 0x00001022;
|
||||
|
||||
|
||||
/**
|
||||
|
|
|
@ -110,9 +110,9 @@ interface nsIAccessibleRole : nsISupports
|
|||
const unsigned long ROLE_WINDOW = 9;
|
||||
|
||||
/**
|
||||
* A sub-document (<frame> or <iframe>)
|
||||
* XXX: document this.
|
||||
*/
|
||||
const unsigned long ROLE_INTERNAL_FRAME = 10;
|
||||
const unsigned long ROLE_CLIENT = 10;
|
||||
|
||||
/**
|
||||
* Represents a menu, which presents a list of options from which the user can
|
||||
|
|
|
@ -56,7 +56,7 @@ static const PRUint32 atkRoleMap[] = {
|
|||
ATK_ROLE_UNKNOWN, // nsIAccessibleRole::ROLE_CARET 7
|
||||
ATK_ROLE_ALERT, // nsIAccessibleRole::ROLE_ALERT 8
|
||||
ATK_ROLE_WINDOW, // nsIAccessibleRole::ROLE_WINDOW 9
|
||||
ATK_ROLE_INTERNAL_FRAME, // nsIAccessibleRole::ROLE_INTERNAL_FRAME 10
|
||||
ATK_ROLE_PANEL, // nsIAccessibleRole::ROLE_CLIENT 10
|
||||
ATK_ROLE_MENU, // nsIAccessibleRole::ROLE_MENUPOPUP 11
|
||||
ATK_ROLE_MENU_ITEM, // nsIAccessibleRole::ROLE_MENUITEM 12
|
||||
ATK_ROLE_TOOL_TIP, // nsIAccessibleRole::ROLE_TOOLTIP 13
|
||||
|
|
|
@ -1630,8 +1630,6 @@ nsresult nsAccessibilityService::GetAccessibleByType(nsIDOMNode *aNode,
|
|||
switch (type)
|
||||
{
|
||||
#ifdef MOZ_XUL
|
||||
case nsIAccessibleProvider::NoAccessible:
|
||||
return NS_OK;
|
||||
// XUL controls
|
||||
case nsIAccessibleProvider::XULAlert:
|
||||
*aAccessible = new nsXULAlertAccessible(aNode, weakShell);
|
||||
|
@ -1716,9 +1714,6 @@ nsresult nsAccessibilityService::GetAccessibleByType(nsIDOMNode *aNode,
|
|||
case nsIAccessibleProvider::XULMenuSeparator:
|
||||
*aAccessible = new nsXULMenuSeparatorAccessible(aNode, weakShell);
|
||||
break;
|
||||
case nsIAccessibleProvider::XULPane:
|
||||
*aAccessible = new nsEnumRoleAccessible(aNode, weakShell, nsIAccessibleRole::ROLE_PANE);
|
||||
break;
|
||||
case nsIAccessibleProvider::XULProgressMeter:
|
||||
*aAccessible = new nsXULProgressMeterAccessible(aNode, weakShell);
|
||||
break;
|
||||
|
|
|
@ -152,7 +152,7 @@ static const char kRoleNames[][20] = {
|
|||
"caret", //ROLE_CARET
|
||||
"alert", //ROLE_ALERT
|
||||
"window", //ROLE_WINDOW
|
||||
"internal frame", //ROLE_INTERNAL_FRAME
|
||||
"client", //ROLE_CLIENT
|
||||
"menupopup", //ROLE_MENUPOPUP
|
||||
"menuitem", //ROLE_MENUITEM
|
||||
"tooltip", //ROLE_TOOLTIP
|
||||
|
|
|
@ -171,7 +171,7 @@ NS_IMETHODIMP nsCaretAccessible::NotifySelectionChanged(nsIDOMDocument *aDoc, ns
|
|||
nsIPresShell *presShell = doc->GetPrimaryShell();
|
||||
NS_ENSURE_TRUE(presShell, NS_OK);
|
||||
|
||||
// Get first nsIAccessibleText in parent chain and fire caret-move, selection-change event for it
|
||||
// Get first nnsIAccessibleText in parent chain and fire caret-move, selection-change event for it
|
||||
nsCOMPtr<nsIAccessible> accessible;
|
||||
nsIAccessibilityService *accService = mRootAccessible->GetAccService();
|
||||
NS_ENSURE_TRUE(accService, NS_ERROR_FAILURE);
|
||||
|
|
|
@ -74,7 +74,7 @@ NS_IMETHODIMP nsOuterDocAccessible::GetName(nsAString& aName)
|
|||
/* unsigned long getRole (); */
|
||||
NS_IMETHODIMP nsOuterDocAccessible::GetRole(PRUint32 *aRole)
|
||||
{
|
||||
*aRole = nsIAccessibleRole::ROLE_INTERNAL_FRAME;
|
||||
*aRole = nsIAccessibleRole::ROLE_CLIENT;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
|
|
@ -597,9 +597,6 @@ nsresult nsRootAccessible::HandleEventWithTarget(nsIDOMEvent* aEvent,
|
|||
aEvent->GetType(eventType);
|
||||
nsAutoString localName;
|
||||
aTargetNode->GetLocalName(localName);
|
||||
#ifdef MOZ_XUL
|
||||
PRBool isTree = localName.EqualsLiteral("tree");
|
||||
#endif
|
||||
#ifdef DEBUG_A11Y
|
||||
// Very useful for debugging, please leave this here.
|
||||
if (eventType.EqualsLiteral("AlertActive")) {
|
||||
|
@ -645,9 +642,8 @@ nsresult nsRootAccessible::HandleEventWithTarget(nsIDOMEvent* aEvent,
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
#ifdef MOZ_XUL
|
||||
if (eventType.EqualsLiteral("TreeViewChanged")) { // Always asynch, always from user input
|
||||
if (!isTree)
|
||||
if (!localName.EqualsLiteral("tree"))
|
||||
return NS_OK;
|
||||
|
||||
nsCOMPtr<nsIContent> treeContent = do_QueryInterface(aTargetNode);
|
||||
|
@ -655,29 +651,6 @@ nsresult nsRootAccessible::HandleEventWithTarget(nsIDOMEvent* aEvent,
|
|||
return accService->InvalidateSubtreeFor(eventShell, treeContent,
|
||||
nsIAccessibleEvent::EVENT_ASYNCH_SIGNIFICANT_CHANGE);
|
||||
}
|
||||
#endif
|
||||
|
||||
if (eventType.EqualsLiteral("popuphiding")) {
|
||||
// If accessible focus was on or inside popup that closes,
|
||||
// then restore it to true current focus.
|
||||
// This is the case when we've been getting DOMMenuItemActive events
|
||||
// inside of a combo box that closes. The real focus is on the combo box.
|
||||
// It's also the case when a popup gets focus in ATK -- when it closes
|
||||
// we need to fire an event to restore focus to where it was
|
||||
if (!gLastFocusedNode) {
|
||||
return NS_OK;
|
||||
}
|
||||
if (gLastFocusedNode != aTargetNode) {
|
||||
// Was not focused on popup
|
||||
nsCOMPtr<nsIDOMNode> parentOfFocus;
|
||||
gLastFocusedNode->GetParentNode(getter_AddRefs(parentOfFocus));
|
||||
if (parentOfFocus != aTargetNode) {
|
||||
return NS_OK; // And was not focused on an item inside the popup
|
||||
}
|
||||
}
|
||||
// Focus was on or inside of a popup that's being hidden
|
||||
FireCurrentFocusEvent();
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIAccessible> accessible;
|
||||
accService->GetAccessibleInShell(aTargetNode, eventShell,
|
||||
|
@ -686,9 +659,8 @@ nsresult nsRootAccessible::HandleEventWithTarget(nsIDOMEvent* aEvent,
|
|||
if (!privAcc)
|
||||
return NS_OK;
|
||||
|
||||
#ifdef MOZ_XUL
|
||||
if (eventType.EqualsLiteral("TreeRowCountChanged")) {
|
||||
if (!isTree)
|
||||
if (!localName.EqualsLiteral("tree"))
|
||||
return NS_OK;
|
||||
|
||||
nsCOMPtr<nsIDOMDataContainerEvent> dataEvent(do_QueryInterface(aEvent));
|
||||
|
@ -713,7 +685,6 @@ nsresult nsRootAccessible::HandleEventWithTarget(nsIDOMEvent* aEvent,
|
|||
|
||||
return treeAccCache->InvalidateCache(index, count);
|
||||
}
|
||||
#endif
|
||||
|
||||
if (eventType.EqualsLiteral("RadioStateChange")) {
|
||||
PRUint32 state = State(accessible);
|
||||
|
@ -752,7 +723,7 @@ nsresult nsRootAccessible::HandleEventWithTarget(nsIDOMEvent* aEvent,
|
|||
nsCOMPtr<nsIAccessible> treeItemAccessible;
|
||||
#ifdef MOZ_XUL
|
||||
// If it's a tree element, need the currently selected item
|
||||
if (isTree) {
|
||||
if (localName.EqualsLiteral("tree")) {
|
||||
nsCOMPtr<nsIDOMXULMultiSelectControlElement> multiSelect =
|
||||
do_QueryInterface(aTargetNode);
|
||||
if (multiSelect) {
|
||||
|
@ -876,6 +847,28 @@ nsresult nsRootAccessible::HandleEventWithTarget(nsIDOMEvent* aEvent,
|
|||
nsAccUtils::FireAccEvent(event, accessible);
|
||||
}
|
||||
}
|
||||
|
||||
else if (eventType.EqualsLiteral("popuphiding")) {
|
||||
// If accessible focus was on or inside popup that closes,
|
||||
// then restore it to true current focus.
|
||||
// This is the case when we've been getting DOMMenuItemActive events
|
||||
// inside of a combo box that closes. The real focus is on the combo box.
|
||||
// It's also the case when a popup gets focus in ATK -- when it closes
|
||||
// we need to fire an event to restore focus to where it was
|
||||
if (!gLastFocusedNode) {
|
||||
return NS_OK;
|
||||
}
|
||||
if (gLastFocusedNode != aTargetNode) {
|
||||
// Was not focused on popup
|
||||
nsCOMPtr<nsIDOMNode> parentOfFocus;
|
||||
gLastFocusedNode->GetParentNode(getter_AddRefs(parentOfFocus));
|
||||
if (parentOfFocus != aTargetNode) {
|
||||
return NS_OK; // And was not focused on an item inside the popup
|
||||
}
|
||||
}
|
||||
// Focus was on or inside of a popup that's being hidden
|
||||
FireCurrentFocusEvent();
|
||||
}
|
||||
else if (eventType.EqualsLiteral("DOMMenuInactive")) {
|
||||
if (Role(accessible) == nsIAccessibleRole::ROLE_MENUPOPUP) {
|
||||
nsAccUtils::FireAccEvent(nsIAccessibleEvent::EVENT_MENUPOPUP_END,
|
||||
|
@ -884,11 +877,6 @@ nsresult nsRootAccessible::HandleEventWithTarget(nsIDOMEvent* aEvent,
|
|||
}
|
||||
else if (eventType.EqualsLiteral("DOMMenuItemActive")) {
|
||||
if (!treeItemAccessible) {
|
||||
#ifdef MOZ_XUL
|
||||
if (isTree) {
|
||||
return NS_OK; // Tree with nothing selected
|
||||
}
|
||||
#endif
|
||||
nsCOMPtr<nsPIAccessNode> menuAccessNode = do_QueryInterface(accessible);
|
||||
NS_ENSURE_TRUE(menuAccessNode, NS_ERROR_FAILURE);
|
||||
nsIFrame* menuFrame = menuAccessNode->GetFrame();
|
||||
|
|
|
@ -52,7 +52,7 @@ static const NSString* AXRoles [] = {
|
|||
NSAccessibilityUnknownRole, // ROLE_CARET. unused on OS X
|
||||
NSAccessibilityWindowRole, // ROLE_ALERT
|
||||
NSAccessibilityWindowRole, // ROLE_WINDOW. irrelevant on OS X; all window a11y is handled by the system.
|
||||
@"AXWebArea", // ROLE_INTERNAL_FRAME
|
||||
@"AXWebArea", // ROLE_CLIENT
|
||||
NSAccessibilityMenuRole, // ROLE_MENUPOPUP. the parent of menuitems
|
||||
NSAccessibilityMenuItemRole, // ROLE_MENUITEM.
|
||||
@"AXHelpTag", // ROLE_TOOLTIP. 10.4+ only, so we re-define the constant.
|
||||
|
|
|
@ -95,8 +95,8 @@ static const WindowsRoleMapItem gWindowsRoleMap[] = {
|
|||
// nsIAccessibleRole::ROLE_WINDOW
|
||||
{ ROLE_SYSTEM_WINDOW, ROLE_SYSTEM_WINDOW },
|
||||
|
||||
// nsIAccessibleRole::ROLE_INTERNAL_FRAME
|
||||
{ USE_ROLE_STRING, IA2_ROLE_INTERNAL_FRAME},
|
||||
// nsIAccessibleRole::ROLE_CLIENT
|
||||
{ USE_ROLE_STRING, IA2_ROLE_UNKNOWN},
|
||||
|
||||
// nsIAccessibleRole::ROLE_MENUPOPUP
|
||||
{ ROLE_SYSTEM_MENUPOPUP, ROLE_SYSTEM_MENUPOPUP },
|
||||
|
@ -429,7 +429,7 @@ static const WindowsRoleMapItem gWindowsRoleMap[] = {
|
|||
{ ROLE_SYSTEM_LISTITEM, ROLE_SYSTEM_LISTITEM },
|
||||
|
||||
// nsIAccessibleRole::ROLE_RICH_OPTION
|
||||
{ ROLE_SYSTEM_LISTITEM, ROLE_SYSTEM_LISTITEM },
|
||||
{ ROLE_SYSTEM_LIST, ROLE_SYSTEM_LIST },
|
||||
|
||||
// nsIAccessibleRole::ROLE_LISTBOX
|
||||
{ ROLE_SYSTEM_LIST, ROLE_SYSTEM_LIST },
|
||||
|
|
|
@ -64,11 +64,3 @@ nsXULAlertAccessible::GetState(PRUint32 *aState, PRUint32 *aExtraState)
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsXULAlertAccessible::GetName(nsAString& aName)
|
||||
{
|
||||
// Screen readers need to read contents of alert, not the accessible name.
|
||||
// If we have both some screen readers will read the alert twice.
|
||||
aName.Truncate();
|
||||
return NS_OK;
|
||||
}
|
||||
|
|
|
@ -50,7 +50,6 @@ public:
|
|||
NS_DECL_ISUPPORTS_INHERITED
|
||||
NS_IMETHOD GetRole(PRUint32 *aRole);
|
||||
NS_IMETHOD GetState(PRUint32 *aState, PRUint32 *aExtraState);
|
||||
NS_IMETHOD GetName(nsAString& aName);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -486,9 +486,7 @@ NS_IMETHODIMP nsXULMenuitemAccessible::GetRole(PRUint32 *aRole)
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIAccessible> parent;
|
||||
GetParent(getter_AddRefs(parent));
|
||||
if (parent && Role(parent) == nsIAccessibleRole::ROLE_COMBOBOX_LIST) {
|
||||
if (mParent && Role(mParent) == nsIAccessibleRole::ROLE_COMBOBOX_LIST) {
|
||||
*aRole = nsIAccessibleRole::ROLE_COMBOBOX_OPTION;
|
||||
return NS_OK;
|
||||
}
|
||||
|
@ -718,18 +716,14 @@ NS_IMETHODIMP nsXULMenupopupAccessible::GetRole(PRUint32 *aRole)
|
|||
if (!content) {
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
nsCOMPtr<nsIAccessible> parent;
|
||||
GetParent(getter_AddRefs(parent));
|
||||
if (parent) {
|
||||
// Some widgets like the search bar have several popups, owned by buttons
|
||||
PRUint32 role = Role(parent);
|
||||
if (role == nsIAccessibleRole::ROLE_COMBOBOX ||
|
||||
role == nsIAccessibleRole::ROLE_PUSHBUTTON) {
|
||||
*aRole = nsIAccessibleRole::ROLE_COMBOBOX_LIST;
|
||||
return NS_OK;
|
||||
}
|
||||
if ((mParent && Role(mParent) == nsIAccessibleRole::ROLE_COMBOBOX) ||
|
||||
content->AttrValueIs(kNameSpaceID_None, nsAccessibilityAtoms::type,
|
||||
nsAccessibilityAtoms::autocomplete, eIgnoreCase)) {
|
||||
*aRole = nsIAccessibleRole::ROLE_COMBOBOX_LIST;
|
||||
}
|
||||
else {
|
||||
*aRole = nsIAccessibleRole::ROLE_MENUPOPUP;
|
||||
}
|
||||
*aRole = nsIAccessibleRole::ROLE_MENUPOPUP;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
|
|
@ -41,7 +41,6 @@
|
|||
#include "nsAccessibilityService.h"
|
||||
#include "nsIContent.h"
|
||||
#include "nsIDOMXULMenuListElement.h"
|
||||
#include "nsIDOMXULPopupElement.h"
|
||||
#include "nsIDOMXULSelectCntrlItemEl.h"
|
||||
#include "nsIDOMXULSelectCntrlEl.h"
|
||||
#include "nsIDOMXULTextboxElement.h"
|
||||
|
@ -195,20 +194,9 @@ NS_IMETHODIMP nsXULListboxAccessible::GetValue(nsAString& _retval)
|
|||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsXULListboxAccessible::GetRole(PRUint32 *aRole)
|
||||
NS_IMETHODIMP nsXULListboxAccessible::GetRole(PRUint32 *_retval)
|
||||
{
|
||||
nsCOMPtr<nsIContent> content = do_QueryInterface(mDOMNode);
|
||||
if (content) {
|
||||
// A richlistbox is used with the new autocomplete URL bar,
|
||||
// and has a parent popup <panel>
|
||||
nsCOMPtr<nsIDOMXULPopupElement> xulPopup =
|
||||
do_QueryInterface(content->GetParent());
|
||||
if (xulPopup) {
|
||||
*aRole = nsIAccessibleRole::ROLE_COMBOBOX_LIST;
|
||||
return NS_OK;
|
||||
}
|
||||
}
|
||||
*aRole = nsIAccessibleRole::ROLE_LIST;
|
||||
*_retval = nsIAccessibleRole::ROLE_LIST;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
@ -262,8 +250,6 @@ NS_IMETHODIMP nsXULListitemAccessible::GetRole(PRUint32 *aRole)
|
|||
{
|
||||
if (mIsCheckbox)
|
||||
*aRole = nsIAccessibleRole::ROLE_CHECKBUTTON;
|
||||
else if (mParent && Role(mParent) == nsIAccessibleRole::ROLE_COMBOBOX_LIST)
|
||||
*aRole = nsIAccessibleRole::ROLE_COMBOBOX_OPTION;
|
||||
else
|
||||
*aRole = nsIAccessibleRole::ROLE_RICH_OPTION;
|
||||
return NS_OK;
|
||||
|
|
|
@ -61,9 +61,13 @@ NS_IMETHODIMP nsXULTextAccessible::GetName(nsAString& aName)
|
|||
if (!content) {
|
||||
return NS_ERROR_FAILURE; // Node shut down
|
||||
}
|
||||
// if the value attr doesn't exist, the screen reader must get the accessible text
|
||||
// from the accessible text interface or from the children
|
||||
return content->GetAttr(kNameSpaceID_None, nsAccessibilityAtoms::value, aName);
|
||||
if (!content->GetAttr(kNameSpaceID_None, nsAccessibilityAtoms::value,
|
||||
aName)) {
|
||||
// if the value doesn't exist, flatten the inner content as the name (for descriptions)
|
||||
return AppendFlatStringFromSubtree(content, &aName);
|
||||
}
|
||||
// otherwise, use the value attribute as the name (for labels)
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
|
@ -172,9 +176,13 @@ NS_IMETHODIMP nsXULLinkAccessible::GetName(nsAString& aName)
|
|||
|
||||
NS_IMETHODIMP nsXULLinkAccessible::GetRole(PRUint32 *aRole)
|
||||
{
|
||||
// We used to say ROLE_BUTTON if there was no href, but then screen readers
|
||||
// would tell users to hit the space bar for activation, which is wrong for a link
|
||||
*aRole = nsIAccessibleRole::ROLE_LINK;
|
||||
if (mIsLink) {
|
||||
*aRole = nsIAccessibleRole::ROLE_LINK;
|
||||
} else {
|
||||
// default to calling the link a button; might have javascript
|
||||
*aRole = nsIAccessibleRole::ROLE_PUSHBUTTON;
|
||||
}
|
||||
// should there be a third case where it becomes just text?
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
|
|
@ -97,8 +97,11 @@ var PlacesCommandHook = {
|
|||
break;
|
||||
case "keypress":
|
||||
if (aEvent.keyCode == KeyEvent.DOM_VK_ESCAPE ||
|
||||
aEvent.keyCode == KeyEvent.DOM_VK_RETURN)
|
||||
this.panel.hidePopup(); // hide the panel
|
||||
aEvent.keyCode == KeyEvent.DOM_VK_RETURN) {
|
||||
// focus the content area and hide the panel
|
||||
window.content.focus();
|
||||
this.panel.hidePopup();
|
||||
}
|
||||
break;
|
||||
}
|
||||
},
|
||||
|
|
|
@ -1503,20 +1503,13 @@ function loadOneOrMoreURIs(aURIString)
|
|||
}
|
||||
}
|
||||
|
||||
function focusAndSelectUrlBar()
|
||||
function openLocation()
|
||||
{
|
||||
if (gURLBar && isElementVisible(gURLBar) && !gURLBar.readOnly) {
|
||||
gURLBar.focus();
|
||||
gURLBar.select();
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
function openLocation()
|
||||
{
|
||||
if (focusAndSelectUrlBar())
|
||||
return;
|
||||
}
|
||||
#ifdef XP_MACOSX
|
||||
if (window.location.href != getBrowserURL()) {
|
||||
var win = getTopWin();
|
||||
|
@ -5758,23 +5751,16 @@ IdentityHandler.prototype = {
|
|||
this._identityPopupContentSupp.textContent = supplemental;
|
||||
this._identityPopupContentVerif.textContent = verifier;
|
||||
},
|
||||
|
||||
hideIdentityPopup : function() {
|
||||
this._identityPopup.hidePopup();
|
||||
},
|
||||
|
||||
|
||||
/**
|
||||
* Click handler for the identity-box element in primary chrome.
|
||||
*/
|
||||
handleIdentityButtonEvent : function(event) {
|
||||
|
||||
handleIdentityClick : function(event) {
|
||||
event.stopPropagation();
|
||||
|
||||
if ((event.type == "click" && event.button != 0) ||
|
||||
(event.type == "keypress" && event.charCode != KeyEvent.DOM_VK_SPACE &&
|
||||
event.keyCode != KeyEvent.DOM_VK_RETURN))
|
||||
return; // Left click, space or enter only
|
||||
|
||||
if (event.button != 0)
|
||||
return; // We only want left-clicks
|
||||
|
||||
// Make sure that the display:none style we set in xul is removed now that
|
||||
// the popup is actually needed
|
||||
this._identityPopup.hidden = false;
|
||||
|
|
|
@ -106,8 +106,7 @@
|
|||
<panel type="autocomplete-richlistbox" chromedir="&locale.dir;" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/>
|
||||
|
||||
<panel id="editBookmarkPanel" orient="vertical" hidden="true"
|
||||
onpopupshown="PlacesCommandHook.editBookmarkPanelShown();"
|
||||
label="&bookmarkPageCmd2.label;">
|
||||
onpopupshown="PlacesCommandHook.editBookmarkPanelShown();">
|
||||
<vbox id="editBookmarkPanelContent" flex="1"/>
|
||||
<hbox flex="1">
|
||||
<spacer flex="1"/>
|
||||
|
@ -146,14 +145,12 @@
|
|||
<popup id="placesContext"/>
|
||||
|
||||
<!-- Popup for site identity information -->
|
||||
<panel id="identity-popup" position="after_start" hidden="true" noautofocus="true"
|
||||
onpopupshown="document.getElementById('identity-popup-more-info-link').focus();"
|
||||
onpopuphidden="focusAndSelectUrlBar();" norestorefocus="true">
|
||||
<panel id="identity-popup" position="after_start" hidden="true" noautofocus="true">
|
||||
<hbox id="identity-popup-container" align="top">
|
||||
<image id="identity-popup-icon"/>
|
||||
<vbox id="identity-popup-content-box">
|
||||
<!-- Title Bar -->
|
||||
<label id="identity-popup-title" control="identity-popup"/>
|
||||
<label id="identity-popup-title"/>
|
||||
<!-- Content area -->
|
||||
<description id="identity-popup-content"/>
|
||||
<description id="identity-popup-content-supplemental"/>
|
||||
|
@ -170,7 +167,6 @@
|
|||
<label id="identity-popup-more-info-link"
|
||||
class="text-link plain"
|
||||
value="&identity.moreInfoLinkText;"
|
||||
onblur="getIdentityHandler().hideIdentityPopup();"
|
||||
onclick="getIdentityHandler().handleMoreInfoClick(event);"/>
|
||||
</vbox>
|
||||
</hbox>
|
||||
|
@ -273,9 +269,8 @@
|
|||
pageproxystate="invalid">
|
||||
<!-- Use onclick instead of normal popup= syntax since the popup
|
||||
code fires onmousedown, and hence eats our favicon drag events -->
|
||||
<box id="identity-box" role="button"
|
||||
onclick="getIdentityHandler().handleIdentityButtonEvent(event);"
|
||||
onkeypress="getIdentityHandler().handleIdentityButtonEvent(event);">
|
||||
<box id="identity-box"
|
||||
onclick="getIdentityHandler().handleIdentityClick(event);">
|
||||
<hbox align="center">
|
||||
<deck id="page-proxy-deck" onclick="PageProxyClickHandler(event);">
|
||||
<image id="page-proxy-button"
|
||||
|
|
|
@ -846,11 +846,6 @@ toolbar[iconsize="small"] #paste-button[disabled="true"] {
|
|||
#identity-box {
|
||||
background-color: -moz-dialog;
|
||||
-moz-border-end: 1px solid ThreeDShadow;
|
||||
-moz-user-focus: normal;
|
||||
}
|
||||
|
||||
#identity-box:focus {
|
||||
outline: 1px dotted -moz-DialogText;
|
||||
}
|
||||
|
||||
#identity-icon-label {
|
||||
|
|
|
@ -1635,11 +1635,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
|
|||
border-right: 1px solid #888;
|
||||
background-color: white;
|
||||
opacity: 0.9;
|
||||
-moz-user-focus: normal;
|
||||
}
|
||||
|
||||
#identity-box:focus {
|
||||
outline: 1.4pt solid -moz-mac-focusring;
|
||||
}
|
||||
|
||||
#identity-box:hover {
|
||||
|
|
|
@ -1592,11 +1592,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
|
|||
/* currently, the identity box is always LTR */
|
||||
-moz-outline-radius-topleft: 2px;
|
||||
-moz-outline-radius-bottomleft: 2px;
|
||||
-moz-user-focus: normal;
|
||||
}
|
||||
|
||||
#identity-box:focus {
|
||||
outline: 1px dotted -moz-DialogText;
|
||||
}
|
||||
|
||||
#identity-box:hover {
|
||||
|
|
|
@ -386,9 +386,6 @@
|
|||
<method name="onKeyPress">
|
||||
<parameter name="aEvent"/>
|
||||
<body><![CDATA[
|
||||
if (aEvent.target.localName != "textbox")
|
||||
return; // Let child buttons of autocomplete take input
|
||||
|
||||
//XXXpch this is so bogus...
|
||||
if (aEvent.getPreventDefault())
|
||||
return false;
|
||||
|
@ -539,7 +536,7 @@
|
|||
</resources>
|
||||
|
||||
<content ignorekeys="true">
|
||||
<xul:tree anonid="tree" class="autocomplete-tree plain" hidecolumnpicker="true" flex="1" seltype="single">
|
||||
<xul:tree anonid="tree" class="autocomplete-tree plain" hidecolumnpicker="true" flex="1">
|
||||
<xul:treecols anonid="treecols">
|
||||
<xul:treecol id="treecolAutoCompleteValue" class="autocomplete-treecol" flex="1" overflow="true"/>
|
||||
</xul:treecols>
|
||||
|
@ -744,10 +741,6 @@
|
|||
|
||||
<binding id="autocomplete-base-popup" extends="chrome://global/content/bindings/popup.xml#popup">
|
||||
<implementation implements="nsIAutoCompletePopup">
|
||||
<!-- nsIAccessible from #popup -->
|
||||
<property name="accessibleType" readonly="true"
|
||||
onget="return Components.interfaces.nsIAccessibleProvider.NoAccessible;"/>
|
||||
|
||||
<field name="mInput">null</field>
|
||||
<field name="mPopupOpen">false</field>
|
||||
|
||||
|
@ -842,9 +835,6 @@
|
|||
]]></handler>
|
||||
|
||||
<handler event="popuphiding"><![CDATA[
|
||||
var isListActive = true;
|
||||
if (this.selectedIndex == -1)
|
||||
isListActive = false;
|
||||
var controller = this.view.QueryInterface(Components.interfaces.nsIAutoCompleteController);
|
||||
controller.stopSearch();
|
||||
|
||||
|
@ -860,10 +850,6 @@
|
|||
// when the popupshowing handler runs.
|
||||
this.mInput.maxRows = this._normalMaxRows;
|
||||
this._normalMaxRows = -1;
|
||||
// If the list was being navigated and then closed, make sure
|
||||
// we fire accessible focus event back to textbox
|
||||
if (isListActive)
|
||||
this.mInput._focus();
|
||||
]]></handler>
|
||||
</handlers>
|
||||
</binding>
|
||||
|
|
|
@ -9,8 +9,20 @@
|
|||
<resources>
|
||||
<stylesheet src="chrome://global/skin/popup.css"/>
|
||||
</resources>
|
||||
</binding>
|
||||
|
||||
<binding id="panel"
|
||||
extends="chrome://global/content/bindings/popup.xml#popup-base">
|
||||
|
||||
<implementation implements="nsIDOMXULPopupElement, nsIAccessibleProvider">
|
||||
<property name="accessibleType" readonly="true">
|
||||
<getter>
|
||||
<![CDATA[
|
||||
return Components.interfaces.nsIAccessibleProvider.XULMenupopup;
|
||||
]]>
|
||||
</getter>
|
||||
</property>
|
||||
|
||||
<implementation implements="nsIDOMXULPopupElement">
|
||||
<property name="position" onget="return this.getAttribute('position');"
|
||||
onset="this.setAttribute('position', val); return val;"/>
|
||||
<property name="popupBoxObject">
|
||||
|
@ -155,24 +167,13 @@
|
|||
</binding>
|
||||
|
||||
<binding id="popup"
|
||||
extends="chrome://global/content/bindings/popup.xml#popup-base">
|
||||
|
||||
extends="chrome://global/content/bindings/popup.xml#panel">
|
||||
<content>
|
||||
<xul:arrowscrollbox class="popup-internal-box" flex="1" orient="vertical">
|
||||
<children/>
|
||||
</xul:arrowscrollbox>
|
||||
</content>
|
||||
|
||||
<implementation implements="nsIAccessibleProvider">
|
||||
<property name="accessibleType" readonly="true">
|
||||
<getter>
|
||||
<![CDATA[
|
||||
return Components.interfaces.nsIAccessibleProvider.XULMenupopup;
|
||||
]]>
|
||||
</getter>
|
||||
</property>
|
||||
</implementation>
|
||||
|
||||
<handlers>
|
||||
<handler event="contextmenu" action="event.preventDefault();"/>
|
||||
|
||||
|
@ -197,64 +198,6 @@
|
|||
</handlers>
|
||||
</binding>
|
||||
|
||||
<binding id="panel"
|
||||
extends="chrome://global/content/bindings/popup.xml#popup-base">
|
||||
<!-- This separate binding for dialog-like panels - not menu, list or autocomplete popups
|
||||
exposes the popup as an alert or a pane, depending on whether it is always intended
|
||||
to get keyboard navigation when it opens -->
|
||||
<implementation implements="nsIDOMXULPopupElement, nsIAccessibleProvider">
|
||||
<property name="accessibleType" readonly="true">
|
||||
<getter>
|
||||
<![CDATA[
|
||||
return (this.getAttribute("noautofocus") == "true") ?
|
||||
Components.interfaces.nsIAccessibleProvider.XULAlert :
|
||||
Components.interfaces.nsIAccessibleProvider.XULPane;
|
||||
]]></getter>
|
||||
</property>
|
||||
<field name="_prevFocus">0</field>
|
||||
</implementation>
|
||||
|
||||
<handlers>
|
||||
<handler event="popupshowing"><![CDATA[
|
||||
// Capture the previous focus before has a chance to get set inside the panel
|
||||
try {
|
||||
this._prevFocus = document.commandDispatcher.focusedElement;
|
||||
if (!this._prevFocus) // Content window has focus
|
||||
this._prevFocus = document.commandDispatcher.focusedWindow;
|
||||
} catch (ex) {}
|
||||
]]></handler>
|
||||
<handler event="popupshown"><![CDATA[
|
||||
// Fire event for accessibility APIs
|
||||
var alertEvent = document.createEvent("Events");
|
||||
alertEvent.initEvent("AlertActive", true, true);
|
||||
this.dispatchEvent(alertEvent);
|
||||
]]></handler>
|
||||
<handler event="popuphiding"><![CDATA[
|
||||
function restoreFocusIfInPanel(aPanel, currentFocus, prevFocus) {
|
||||
try {
|
||||
if (document.commandDispatcher.focusedWindow != window)
|
||||
return; // Focus has already been set to a window outside of this panel
|
||||
} catch(ex) {}
|
||||
var ancestorOfFocus = currentFocus;
|
||||
while (ancestorOfFocus) {
|
||||
if (ancestorOfFocus == aPanel) {
|
||||
// Focus was set on an element inside this panel,
|
||||
// so we need to move it back to where it was previously
|
||||
prevFocus.focus();
|
||||
return;
|
||||
}
|
||||
ancestorOfFocus = ancestorOfFocus.parentNode;
|
||||
}
|
||||
}
|
||||
try {
|
||||
if (this._prevFocus && this.getAttribute("norestorefocus") != "true")
|
||||
setTimeout(restoreFocusIfInPanel, 0, this, document.commandDispatcher.focusedElement,
|
||||
this._prevFocus);
|
||||
} catch(ex) { }
|
||||
]]></handler>
|
||||
</handlers>
|
||||
</binding>
|
||||
|
||||
<binding id="tooltip" extends="chrome://global/content/bindings/popup.xml#popup">
|
||||
<content>
|
||||
<children>
|
||||
|
|
|
@ -157,10 +157,8 @@
|
|||
<handler event="focus" phase="capturing">
|
||||
<![CDATA[
|
||||
if (!this.hasAttribute("focused")) {
|
||||
if (event.originalTarget == this)
|
||||
this.inputField.focus(); // Forward focus to actual HTML input
|
||||
else if (event.originalTarget != this.inputField)
|
||||
return; // Allow other children (e.g. URL bar buttons) to get focus
|
||||
if (event.originalTarget != this.inputField)
|
||||
this.inputField.focus();
|
||||
else if (this.mIgnoreFocus)
|
||||
this.mIgnoreFocus = false;
|
||||
else if (this.clickSelectsAll)
|
||||
|
|
Загрузка…
Ссылка в новой задаче