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

196755 backing out now-unneeded changes of bug 196755 and bug 206668, r=mconnor

This commit is contained in:
cbiesinger%web.de 2004-10-03 16:13:33 +00:00
Родитель 2a89e5c6c8
Коммит 6ac02e52ed
2 изменённых файлов: 13 добавлений и 35 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

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

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

@ -80,7 +80,6 @@
<xul:tabs class="tabbrowser-tabs" closebutton="true" flex="1" <xul:tabs class="tabbrowser-tabs" closebutton="true" flex="1"
setfocus="false" setfocus="false"
onclick="this.parentNode.parentNode.parentNode.onTabClick(event);" onclick="this.parentNode.parentNode.parentNode.onTabClick(event);"
onmousedown="this.parentNode.parentNode.parentNode.updateContextTab(event);"
ondragover="nsDragAndDrop.dragOver(event, this.parentNode.parentNode.parentNode); ondragover="nsDragAndDrop.dragOver(event, this.parentNode.parentNode.parentNode);
event.stopPropagation();" event.stopPropagation();"
ondragdrop="nsDragAndDrop.drop(event, this.parentNode.parentNode.parentNode); ondragdrop="nsDragAndDrop.drop(event, this.parentNode.parentNode.parentNode);
@ -165,7 +164,7 @@
mTab: aTab, mTab: aTab,
mBrowser: aBrowser, mBrowser: aBrowser,
mBlank: aStartsBlank, mBlank: aStartsBlank,
mIcon: "", mIcon: "",
onProgressChange : function (aWebProgress, aRequest, onProgressChange : function (aWebProgress, aRequest,
aCurSelfProgress, aMaxSelfProgress, aCurSelfProgress, aMaxSelfProgress,
@ -385,17 +384,17 @@
var docTitle; var docTitle;
if (this.docShell.contentViewer) if (this.docShell.contentViewer)
docTitle = this.contentTitle; docTitle = this.contentTitle;
if (!docTitle)
docTitle = this.ownerDocument.documentElement.getAttribute("titledefault");
var modifier = this.ownerDocument.documentElement.getAttribute("titlemodifier"); if (!docTitle)
docTitle = this.ownerDocument.documentElement.getAttribute("titledefault");
var modifier = this.ownerDocument.documentElement.getAttribute("titlemodifier");
if (docTitle) { if (docTitle) {
newTitle += this.ownerDocument.documentElement.getAttribute("titlepreface"); newTitle += this.ownerDocument.documentElement.getAttribute("titlepreface");
newTitle += docTitle; newTitle += docTitle;
var sep = this.ownerDocument.documentElement.getAttribute("titlemenuseparator"); var sep = this.ownerDocument.documentElement.getAttribute("titlemenuseparator");
if (modifier) if (modifier)
newTitle += sep; newTitle += sep;
} }
newTitle += modifier; newTitle += modifier;
window.title = newTitle; window.title = newTitle;
@ -403,22 +402,11 @@
</body> </body>
</method> </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"> <method name="updatePopupMenu">
<parameter name="aPopupMenu"/> <parameter name="aPopupMenu"/>
<body> <body>
<![CDATA[ <![CDATA[
this.mContextTab = document.popupNode;
var disabled = this.mPanelContainer.childNodes.length == 1; var disabled = this.mPanelContainer.childNodes.length == 1;
var menuItems = aPopupMenu.getElementsByAttribute("tbattr", "tabbrowser-multiple"); var menuItems = aPopupMenu.getElementsByAttribute("tbattr", "tabbrowser-multiple");
for (var i = 0; i < menuItems.length; i++) for (var i = 0; i < menuItems.length; i++)