mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

bug 397644. Don't process xhtml2:role, r=mano, r=philringnalda, r=surkov, sr=neil, a=dsicore

This commit is contained in:
aaronleventhal@moonset.net 2007-10-01 17:57:23 -07:00
Родитель d0f7be641e
Коммит 6d162608fa
10 изменённых файлов: 69 добавлений и 83 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
accessible/src/base/nsAccessNode.cpp
Просмотреть файл

@ -856,9 +856,7 @@ nsAccessNode::GetARIARole(nsIContent *aContent, nsString& aRole)
}
}
// In non-HTML content, use XHTML namespaced-role attribute
// XXX We still support XHTML2 for now because of XUL content, but will migrate to XHTML after FF3
else if (!aContent->GetAttr(kNameSpaceID_XHTML, nsAccessibilityAtoms::role, aRole) &&
!aContent->GetAttr(kNameSpaceID_XHTML2_Unofficial, nsAccessibilityAtoms::role, aRole)) {
else if (!aContent->GetAttr(kNameSpaceID_XHTML, nsAccessibilityAtoms::role, aRole)) {
return PR_FALSE;
}

11
browser/components/migration/content/migration.xul
Просмотреть файл

@ -48,8 +48,7 @@
style="width: 40em;"
buttons="accept,cancel"
branded="true"
xmlns:xhtml2="http://www.w3.org/TR/xhtml2"
xmlns:wairole="http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#">
xmlns:xhtml="http://www.w3.org/1999/xhtml">
<script type="application/x-javascript" src="chrome://browser/content/migration/migration.js"/>
@ -133,7 +132,7 @@
<description control="dataSources">&importItems.label;</description>
<vbox id="dataSources" style="overflow: auto; -moz-appearance: listbox" align="left" flex="1"
xhtml2:role="wairole:groupbox"/>
xhtml:role="group"/>
</wizardpage>
<wizardpage id="homePageImport" pageid="homePageImport"
@ -153,16 +152,14 @@
onpageshow="MigrationWizard.onMigratingPageShow();">
<description control="migratingItems">&migrating.label;</description>
<vbox id="migratingItems" style="overflow: auto;" align="left"
xhtml2:role="wairole:groupbox"/>
<vbox id="migratingItems" style="overflow: auto;" align="left" xhtml:role="group"/>
</wizardpage>
<wizardpage id="done" pageid="done" label="&done.title;"
onpageshow="MigrationWizard.onDonePageShow();">
<description control="doneItems">&done.label;</description>
<vbox id="doneItems" style="overflow: auto;" align="left"
xhtml2:role="wairole:groupbox"/>
<vbox id="doneItems" style="overflow: auto;" align="left" xhtml:role="group"/>
</wizardpage>
</wizard>

5
browser/components/preferences/advanced.xul
Просмотреть файл

@ -53,8 +53,7 @@
<prefpane id="paneAdvanced" onpaneload="gAdvancedPane.init();"
helpURI="chrome://browser/locale/help/help.rdf"
xmlns:xhtml2="http://www.w3.org/TR/xhtml2"
xmlns:wairole="http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#"
xmlns:xhtml="http://www.w3.org/1999/xhtml"
xmlns:aaa="http://www.w3.org/2005/07/aaa">
<preferences id="advancedPreferences">
@ -223,7 +222,7 @@
<!-- Update -->
<tabpanel id="updatePanel" orient="vertical" align="start">
<label control="autoUpdateGroup">&autoCheck.label;</label>
<vbox class="indent" id="autoUpdateGroup" xhtml2:role="wairole:groupbox">
<vbox class="indent" id="autoUpdateGroup" xhtml:role="group">
<checkbox id="enableAppUpdate"
label="&enableAppUpdate.label;"
accesskey="&enableAppUpdate.accesskey;"

5
browser/components/safebrowsing/content/warning-overlay.xul
Просмотреть файл

@ -34,9 +34,8 @@
<vbox id="safebrowsing-palm-message-content"
class="safebrowsing-palm-fixed-width"
style="-moz-user-focus: normal"
xmlns:x2="http://www.w3.org/TR/xhtml2"
xmlns:wairole="http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#"
x2:role="wairole:alert">
xmlns:xhtml="http://www.w3.org/1999/xhtml"
xhtml:role="alert">
<hbox id="safebrowsing-palm-close-container" align="center"
class="safebrowsing-palm-fixed-width">

5
toolkit/components/alerts/resources/content/alert.xul
Просмотреть файл

@ -41,9 +41,8 @@
<window id="alertNotification"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
windowtype="alert:alert"
xmlns:xhtml2="http://www.w3.org/TR/xhtml2"
xmlns:wairole="http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#"
xhtml2:role="wairole:alert"
xmlns:xhtml="http://www.w3.org/1999/xhtml"
xhtml:role="alert"
pack="start"
onload="onAlertLoad()">

5
toolkit/content/commonDialog.xul
Просмотреть файл

@ -6,9 +6,8 @@
<dialog id="commonDialog"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:xhtml2="http://www.w3.org/TR/xhtml2"
xmlns:wairole="http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#"
xhtml2:role="wairole:alert"
xmlns:xhtml="http://www.w3.org/1999/xhtml"
xhtml:role="alert"
onload="commonDialogOnLoad();"
ondialogaccept="return commonDialogOnAccept();"
ondialogextra1="return commonDialogOnExtra1();"

101
toolkit/content/widgets/datetimepicker.xml
Просмотреть файл

@ -848,7 +848,6 @@
<content>
<vbox class="datepicker-mainbox"
xmlns:wairole="http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<hbox class="datepicker-monthbox" align="center">
<button class="datepicker-previous datepicker-button" type="repeat"
@ -875,7 +874,7 @@
chromedir="&locale.dir;" xbl:inherits="disabled"
oncommand="document.getBindingParent(this)._increaseOrDecreaseMonth(1);"/>
</hbox>
<grid class="datepicker-grid" html:role="wairole:grid">
<grid class="datepicker-grid" html:role="grid">
<columns>
<column class="datepicker-gridrow" flex="1"/>
<column class="datepicker-gridrow" flex="1"/>
@ -887,67 +886,67 @@
</columns>
<rows anonid="datebox">
<row anonid="dayofweekbox">
<label class="datepicker-weeklabel" html:role="wairole:columnheader"/>
<label class="datepicker-weeklabel" html:role="wairole:columnheader"/>
<label class="datepicker-weeklabel" html:role="wairole:columnheader"/>
<label class="datepicker-weeklabel" html:role="wairole:columnheader"/>
<label class="datepicker-weeklabel" html:role="wairole:columnheader"/>
<label class="datepicker-weeklabel" html:role="wairole:columnheader"/>
<label class="datepicker-weeklabel" html:role="wairole:columnheader"/>
<label class="datepicker-weeklabel" html:role="columnheader"/>
<label class="datepicker-weeklabel" html:role="columnheader"/>
<label class="datepicker-weeklabel" html:role="columnheader"/>
<label class="datepicker-weeklabel" html:role="columnheader"/>
<label class="datepicker-weeklabel" html:role="columnheader"/>
<label class="datepicker-weeklabel" html:role="columnheader"/>
<label class="datepicker-weeklabel" html:role="columnheader"/>
</row>
<row>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
</row>
<row>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
</row>
<row>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
</row>
<row>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
</row>
<row>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
</row>
<row>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
<label class="datepicker-gridlabel" html:role="gridcell"/>
</row>
</rows>
</grid>

7
toolkit/content/widgets/preferences.xml
Просмотреть файл

@ -508,16 +508,15 @@
<content dlgbuttons="accept,cancel" persist="lastSelected screenX screenY"
closebuttonlabel="&preferencesCloseButton.label;"
closebuttonaccesskey="&preferencesCloseButton.accesskey;"
xmlns:xhtml2="http://www.w3.org/TR/xhtml2"
xmlns:wairole="http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#"
xhtml2:role="wairole:dialog"
xmlns:xhtml="http://www.w3.org/1999/xhtml"
xhtml:role="dialog"
#ifdef XP_WIN
title="&preferencesDefaultTitleWin.title;">
#else
title="&preferencesDefaultTitleMac.title;">
#endif
<xul:radiogroup anonid="selector" orient="horizontal" class="paneSelector chromeclass-toolbar"
xhtml2:role="wairole:list"/> <!-- Expose to accessibility APIs as a list -->
xhtml:role="listbox"/> <!-- Expose to accessibility APIs as a listbox -->
<xul:hbox flex="1" class="paneDeckContainer">
<xul:deck anonid="paneDeck" flex="1">
<children includes="prefpane"/>

5
toolkit/mozapps/extensions/content/extensions.xul
Просмотреть файл

@ -52,8 +52,7 @@
<window xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:xhtml2="http://www.w3.org/TR/xhtml2"
xmlns:wairole="http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#"
xmlns:xhtml="http://www.w3.org/1999/xhtml"
id="extensionsManager" windowtype="Extension:Manager"
orient="vertical" title="&addons.title;"
screenX="10" screenY="10" width="&em.width;" height="&em.height;"
@ -152,7 +151,7 @@
<popup id="addonContextMenu" onpopupshowing="return buildContextMenu(event);"/>
<stack id="topStackBar">
<radiogroup id="viewGroup" xhtml2:role="wairole:list" persist="last-selected"
<radiogroup id="viewGroup" xhtml:role="listbox" persist="last-selected"
class="viewSelector chromeclass-toolbar" orient="horizontal">
<radio id="extensions-view" label="&extensions.label;" oncommand="showView('extensions');" persist="last-selected"/>
<radio id="themes-view" label="&themes.label;" oncommand="showView('themes');" persist="last-selected"/>

4
toolkit/mozapps/preferences/removemp.xul
Просмотреть файл

@ -14,8 +14,6 @@
style="width: 35em;"
ondialogaccept="gRemovePasswordDialog.removePassword();"
onload="gRemovePasswordDialog.init()"
xmlns:xhtml2="http://www.w3.org/TR/xhtml2"
xmlns:wairole="http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#"
xmlns:aaa="http://www.w3.org/2005/07/aaa">
<script type="application/javascript" src="chrome://mozapps/content/preferences/removemp.js"/>
@ -36,7 +34,7 @@
<label control="password" value="&setPassword.oldPassword.label;"/>
<textbox id="password" type="password"
oninput="gRemovePasswordDialog.validateInput();"
xhtml2:role="textfield" aaa:describedby="warnings"/>
aaa:describedby="warnings"/>
</hbox>
</groupbox>