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

Backing out workarounds in bug 196755 and 206668 now that the correct fix has landed r=jst sr=jag

This commit is contained in:
neil%parkwaycc.co.uk 2004-02-05 20:31:10 +00:00
Родитель baa4febec9
Коммит 53269c7bf7
2 изменённых файлов: 5 добавлений и 27 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

18
xpfe/global/resources/content/bindings/menulist.xml
Просмотреть файл

@ -24,20 +24,12 @@
</content>
<handlers>
<handler event="command" phase="capturing">
<![CDATA[
// XXX see bug #196755
// originalTarget is workaround for arrowscrollbox retargeting bug
if (event.originalTarget.parentNode.parentNode == this)
this.selectedItem = event.originalTarget;
]]>
</handler>
<handler event="command" phase="capturing"
action="if (event.target.parentNode.parentNode == this) this.selectedItem = event.target;"/>
<handler event="popupshowing">
<![CDATA[
// XXX see bug #196755
// originalTarget is workaround for arrowscrollbox retargeting bug
if (event.originalTarget.parentNode == this && this.selectedItem)
if (event.target.parentNode == this && this.selectedItem)
// Not ready for auto-setting the active child in hierarchies yet.
// For now, only do this when the outermost menupopup opens.
this.menuBoxObject.activeChild = this.selectedInternal;
@ -410,9 +402,7 @@
<![CDATA[
// editable menulists elements aren't in the focus order,
// so when the popup opens we need to force the focus to the inputField
// XXX see bug #196755
// originalTarget is workaround for arrowscrollbox retargeting bug
if (event.originalTarget.parentNode == this) {
if (event.target.parentNode == this) {
if (document.commandDispatcher.focusedElement != this.inputField)
this.inputField.focus();

14
xpfe/global/resources/content/bindings/tabbrowser.xml
Просмотреть файл

@ -84,7 +84,6 @@
tooltiptextnew="&newTabButton.tooltip;"
setfocus="false"
onclick="this.parentNode.parentNode.parentNode.onTabClick(event);"
onmousedown="this.parentNode.parentNode.parentNode.updateContextTab(event);"
ondragover="nsDragAndDrop.dragOver(event, this.parentNode.parentNode.parentNode);
event.stopPropagation();"
ondragdrop="nsDragAndDrop.drop(event, this.parentNode.parentNode.parentNode);
@ -473,22 +472,11 @@
</body>
</method>
<method name="updateContextTab">
<parameter name="aEvent"/>
<body>
<![CDATA[
if (aEvent.originalTarget.localName == "tab")
this.mContextTab = aEvent.originalTarget;
else
this.mContextTab = document.popupNode;
]]>
</body>
</method>
<method name="updatePopupMenu">
<parameter name="aPopupMenu"/>
<body>
<![CDATA[
this.mContextTab = document.popupNode;
var disabled = this.mPanelContainer.childNodes.length == 1;
var menuItems = aPopupMenu.getElementsByAttribute("tbattr", "tabbrowser-multiple");
for (var i = 0; i < menuItems.length; i++)