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

Bug 330710, Replace obsolete preventBubble/preventCapture with stopPropagation, r=neil, r=mconnor, sr=jst

This commit is contained in:
Olli.Pettay%helsinki.fi 2006-03-25 22:03:49 +00:00
Родитель 659937deae
Коммит 04cfde2d6f
65 изменённых файлов: 206 добавлений и 501 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
browser/base/content/browser-menubar.inc
Просмотреть файл

@ -187,7 +187,7 @@
<menupopup onpopupshowing="stylesheetFillPopup(this);"
oncommand="stylesheetSwitchAll(window.content, event.target.getAttribute('data')); setStyleDisabled(false);">
<menuitem label="&pageStyleNoStyle.label;" accesskey="&pageStyleNoStyle.accesskey;"
oncommand="setStyleDisabled(true); event.preventBubble();" type="radio"/>
oncommand="setStyleDisabled(true); event.stopPropagation();" type="radio"/>
<menuitem label="&pageStylePersistentOnly.label;" accesskey="&pageStylePersistentOnly.accesskey;" type="radio" checked="true"/>
<menuseparator/>
</menupopup>
@ -415,10 +415,10 @@
oncommand="BookmarksMenu.loadBookmark(event, event.target, this.database)"
onclick="BookmarksMenu.loadBookmarkMiddleClick(event, this.database)"
ondraggesture="nsDragAndDrop.startDrag(event, BookmarksMenuDNDObserver)"
ondragdrop="nsDragAndDrop.drop(event, BookmarksMenuDNDObserver); event.preventBubble()"
ondragenter="nsDragAndDrop.dragEnter(event, BookmarksMenuDNDObserver); event.preventBubble()"
ondragexit="nsDragAndDrop.dragExit(event, BookmarksMenuDNDObserver); event.preventBubble()"
ondragover="nsDragAndDrop.dragOver(event, BookmarksMenuDNDObserver); event.preventBubble()">
ondragdrop="nsDragAndDrop.drop(event, BookmarksMenuDNDObserver); event.stopPropagation()"
ondragenter="nsDragAndDrop.dragEnter(event, BookmarksMenuDNDObserver); event.stopPropagation()"
ondragexit="nsDragAndDrop.dragExit(event, BookmarksMenuDNDObserver); event.stopPropagation()"
ondragover="nsDragAndDrop.dragOver(event, BookmarksMenuDNDObserver); event.stopPropagation()">
<menupopup id="menu_BookmarksPopup" contextmenu='bookmarks-context-menu'>
<menuitem key="addBookmarkAsKb"
label="&addCurPageAsCmd.label;"

12
browser/base/content/browser.js
Просмотреть файл

@ -1307,8 +1307,6 @@ function ctrlNumberTabSelection(event)
}
event.preventDefault();
event.preventBubble();
event.preventCapture();
event.stopPropagation();
}
@ -1809,8 +1807,6 @@ function BrowserLoadURL(aTriggeringEvent, aPostData)
gBrowser.loadOneTab(url, null, null, aPostData, false);
gURLBar.value = url;
aTriggeringEvent.preventDefault();
aTriggeringEvent.preventBubble();
aTriggeringEvent.preventCapture();
aTriggeringEvent.stopPropagation();
}
else
@ -5219,13 +5215,13 @@ function handleLinkClick(event, href, linkNode)
if (event.ctrlKey) {
#endif
openNewTabWith(href, docURL, null, event);
event.preventBubble();
event.stopPropagation();
return true;
}
// if left button clicked
if (event.shiftKey) {
openNewWindowWith(href, docURL, null);
event.preventBubble();
event.stopPropagation();
return true;
}
@ -5248,7 +5244,7 @@ function handleLinkClick(event, href, linkNode)
openNewTabWith(href, docURL, null, event);
else
openNewWindowWith(href, docURL, null);
event.preventBubble();
event.stopPropagation();
return true;
}
return false;
@ -5275,7 +5271,7 @@ function middleMousePaste(event)
event,
true /* ignore the fact this is a middle click */);
event.preventBubble();
event.stopPropagation();
}
function makeURLAbsolute( base, url )

37
browser/base/content/browser.xul
Просмотреть файл

@ -170,7 +170,7 @@
<observes element="Browser:Back" attribute="disabled"/>
<menupopup context=""
onpopupshowing="BrowserBackMenu(event);"
oncommand="gotoHistoryIndex(event); event.preventBubble();"
oncommand="gotoHistoryIndex(event); event.stopPropagation();"
onclick="checkForMiddleClick(this, event);"/>
</toolbarbutton>
@ -184,7 +184,7 @@
<observes element="Browser:Forward" attribute="disabled"/>
<menupopup context=""
onpopupshowing="BrowserForwardMenu(event);"
oncommand="gotoHistoryIndex(event); event.preventBubble()"
oncommand="gotoHistoryIndex(event); event.stopPropagation()"
onclick="checkForMiddleClick(this, event);"/>
</toolbarbutton>
@ -229,8 +229,7 @@
<image id="page-proxy-favicon"
ondraggesture="PageProxyDragGesture(event);"
onload="this.parentNode.selectedIndex = 1;
event.stopPropagation();
event.preventBubble();"
event.stopPropagation();"
onerror="gBrowser.addToMissedIconCache(this.src);
this.removeAttribute('src');
this.parentNode.selectedIndex = 0;"
@ -242,7 +241,7 @@
class="plain"
id="feed-button"
chromedir="&locale.dir;"
onclick="event.preventBubble();">
onclick="event.stopPropagation();">
<menupopup position="after_end"
onpopupshowing="return FeedHandler.buildFeedList(event);"
#ifdef MOZ_PLACES
@ -251,7 +250,7 @@
oncommand="FeedHandler.addLiveBookmark(event.target.getAttribute('feed'));" />
#endif
</button>
<image id="lock-icon" onclick="if (event.button == 0) displaySecurityInfo(); event.preventBubble();"/>
<image id="lock-icon" onclick="if (event.button == 0) displaySecurityInfo(); event.stopPropagation();"/>
</hbox>
</textbox>
</toolbaritem>
@ -315,10 +314,10 @@
oncommand="BookmarksMenu.loadBookmark(event, event.target, this.database)"
onclick="BookmarksMenu.loadBookmarkMiddleClick(event, this.database)"
ondraggesture="nsDragAndDrop.startDrag(event, BookmarksMenuDNDObserver)"
ondragdrop="nsDragAndDrop.drop(event, BookmarksMenuDNDObserver); event.preventBubble()"
ondragenter="nsDragAndDrop.dragEnter(event, BookmarksMenuDNDObserver); event.preventBubble()"
ondragexit="nsDragAndDrop.dragExit(event, BookmarksMenuDNDObserver); event.preventBubble()"
ondragover="nsDragAndDrop.dragOver(event, BookmarksMenuDNDObserver); event.preventBubble()">
ondragdrop="nsDragAndDrop.drop(event, BookmarksMenuDNDObserver); event.stopPropagation()"
ondragenter="nsDragAndDrop.dragEnter(event, BookmarksMenuDNDObserver); event.stopPropagation()"
ondragexit="nsDragAndDrop.dragExit(event, BookmarksMenuDNDObserver); event.stopPropagation()"
ondragover="nsDragAndDrop.dragOver(event, BookmarksMenuDNDObserver); event.stopPropagation()">
</hbox>
<hbox class="bookmarks-toolbar-overflow-items" mousethrough="always">
<hbox mousethrough="always" id="overflow-padder"/>
@ -332,10 +331,10 @@
oncommand="BookmarksMenu.loadBookmark(event, event.target, this.database)"
onclick="BookmarksMenu.loadBookmarkMiddleClick(event, this.database)"
ondraggesture="nsDragAndDrop.startDrag(event, BookmarksMenuDNDObserver)"
ondragdrop="nsDragAndDrop.drop(event, BookmarksMenuDNDObserver); event.preventBubble()"
ondragenter="nsDragAndDrop.dragEnter(event, BookmarksMenuDNDObserver); event.preventBubble()"
ondragexit="nsDragAndDrop.dragExit(event, BookmarksMenuDNDObserver); event.preventBubble()"
ondragover="nsDragAndDrop.dragOver(event, BookmarksMenuDNDObserver); event.preventBubble()">
ondragdrop="nsDragAndDrop.drop(event, BookmarksMenuDNDObserver); event.stopPropagation()"
ondragenter="nsDragAndDrop.dragEnter(event, BookmarksMenuDNDObserver); event.stopPropagation()"
ondragexit="nsDragAndDrop.dragExit(event, BookmarksMenuDNDObserver); event.stopPropagation()"
ondragover="nsDragAndDrop.dragOver(event, BookmarksMenuDNDObserver); event.stopPropagation()">
<menupopup onpopupshowing="if (event.target == this) BookmarksToolbar.updateOverflowMenu(this);"
#ifndef XP_MACOSX
contextmenu="bookmarks-context-menu"
@ -351,10 +350,10 @@
<toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
observes="Tools:Downloads"
ondragdrop="nsDragAndDrop.drop(event, DownloadsButtonDNDObserver); event.preventBubble()"
ondragover="nsDragAndDrop.dragOver(event, DownloadsButtonDNDObserver); event.preventBubble()"
ondragenter="nsDragAndDrop.dragEnter(event, DownloadsButtonDNDObserver); event.preventBubble()"
ondragexit="nsDragAndDrop.dragExit(event, DownloadsButtonDNDObserver); event.preventBubble()"
ondragdrop="nsDragAndDrop.drop(event, DownloadsButtonDNDObserver); event.stopPropagation()"
ondragover="nsDragAndDrop.dragOver(event, DownloadsButtonDNDObserver); event.stopPropagation()"
ondragenter="nsDragAndDrop.dragEnter(event, DownloadsButtonDNDObserver); event.stopPropagation()"
ondragexit="nsDragAndDrop.dragExit(event, DownloadsButtonDNDObserver); event.stopPropagation()"
label="&downloads.label;"
tooltiptext="&downloads.tooltip;"/>
@ -502,7 +501,7 @@
<menupopup onpopupshowing="stylesheetFillPopup(this);"
oncommand="stylesheetSwitchAll(window.content, event.target.getAttribute('data')); setStyleDisabled(false);">
<menuitem label="&pageStyleNoStyle.label;" accesskey="&pageStyleNoStyle.accesskey;"
oncommand="setStyleDisabled(true); event.preventBubble();" type="radio" hidden="true"/>
oncommand="setStyleDisabled(true); event.stopPropagation();" type="radio" hidden="true"/>
<menuitem label="&pageStylePersistentOnly.label;" accesskey="&pageStylePersistentOnly.accesskey;" type="radio" checked="true"/>
<menuseparator/>
</menupopup>

6
browser/components/bookmarks/content/bookmarksManager.js
Просмотреть файл

@ -185,7 +185,7 @@ function onViewMenuSortItemSelected(aEvent)
break;
}
aEvent.preventCapture();
aEvent.stopPropagation();
}
var gConstructedColumnsMenuItems = false;
@ -216,7 +216,7 @@ function fillColumnsMenu(aEvent)
}
}
aEvent.preventBubble();
aEvent.stopPropagation();
}
function onViewMenuColumnItemSelected(aEvent)
@ -227,7 +227,7 @@ function onViewMenuColumnItemSelected(aEvent)
bookmarksView.toggleColumnVisibility(resource);
}
aEvent.preventBubble();
aEvent.stopPropagation();
}
function onViewSelected(aEvent)

2
browser/components/bookmarks/content/bookmarksManager.xul
Просмотреть файл

@ -172,7 +172,7 @@
<menuitem id="viewCommandToolbar" type="checkbox" class="menuitem-iconic"
label="&menuitem.view.command.toolbar.label;"
accesskey="&menuitem.view.command.toolbar.accesskey;"
oncommand="goToggleToolbar('command-toolbar', 'viewCommandToolbar'); event.preventBubble();"
oncommand="goToggleToolbar('command-toolbar', 'viewCommandToolbar'); event.stopPropagation();"
checked="true"/>
<menu id="descending" label="&menuitem.view.show_columns.label;"
accesskey="&menuitem.view.show_columns.accesskey;">

2
browser/components/bookmarks/content/bookmarksMenu.js
Просмотреть файл

@ -449,7 +449,7 @@ var BookmarksMenu = {
var selection = BookmarksUtils.getSelectionFromResource(rSource);
var browserTarget = whereToOpenLink(aEvent);
BookmarksCommand.openBookmark(selection, browserTarget, aDS);
aEvent.preventBubble();
aEvent.stopPropagation();
},
////////////////////////////////////////////////

8
browser/components/bookmarks/content/bookmarksTree.xml
Просмотреть файл

@ -845,8 +845,8 @@
<!-- context menu -->
<menupopup onpopupshowing="this.parentNode.createTreeContextMenu(event);"
onpopuphidden="if (content) content.focus()"
onclick="event.preventBubble();"
onkeypress="event.preventBubble();"/>
onclick="event.stopPropagation();"
onkeypress="event.stopPropagation();"/>
<vbox flex="1">
<tree anonid="bookmarks-tree" flex="1" class="plain" enableColumnDrag="true"
datasources="rdf:bookmarks rdf:files" ref="NC:BookmarksTopRoot" flags="dont-build-content"
@ -942,8 +942,8 @@
<menupopup xbl:inherits="onpopupshowing"
onpopupshowing="this.parentNode.createTreeContextMenu(event);"
onpopuphidden="if (content) content.focus()"
onclick="event.preventBubble();"
onkeypress="event.preventBubble();"/>
onclick="event.stopPropagation();"
onkeypress="event.stopPropagation();"/>
<tree anonid="bookmarks-tree" flex="1" class="plain" hidecolumnpicker="true"
datasources="rdf:bookmarks rdf:files" ref="NC:BookmarksRoot" flags="dont-build-content"
onselect="this.parentNode.treeBoxObject.view.selectionChanged();" seltype="single">

2
browser/components/places/content/menu.xml
Просмотреть файл

@ -709,7 +709,7 @@
if (this.eventValid(event)) {
this.setSelectionForEvent(event);
// Don't let the event bubble up to a parent toolbar.
event.preventBubble();
event.stopPropagation();
}
]]></handler>
<handler event="DOMMenuItemActive"><![CDATA[

2
browser/components/places/content/places.js
Просмотреть файл

@ -744,7 +744,7 @@ var ViewMenu = {
else
popup.appendChild(menuitem);
}
event.preventBubble();
event.stopPropagation();
},
/**

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

@ -120,7 +120,7 @@
<menu id="viewColumns"
label="&view.columns.label;" accesskey="&view.columns.accesskey;">
<menupopup onpopupshowing="ViewMenu.fillWithColumns(event, null, null, 'checkbox', null);"
oncommand="ViewMenu.showHideColumn(event.target); event.preventBubble();"/>
oncommand="ViewMenu.showHideColumn(event.target); event.stopPropagation();"/>
</menu>
<menuseparator id="groupingSeparator" observes="placesBC_grouping:separator"/>
<menuitem id="viewGroupNone" type="radio" name="group"
@ -134,10 +134,10 @@
<menuseparator id="directionSeparator"/>
<menuitem id="viewSortAscending" type="radio" name="direction"
label="&view.sortAscending.label;" accesskey="&view.sortAscending.accesskey;"
oncommand="ViewMenu.setSortColumn(null, 'ascending'); event.preventBubble();"/>
oncommand="ViewMenu.setSortColumn(null, 'ascending'); event.stopPropagation();"/>
<menuitem id="viewSortDescending" type="radio" name="direction"
label="&view.sortDescending.label;" accesskey="&view.sortDescending.accesskey;"
oncommand="ViewMenu.setSortColumn(null, 'descending'); event.preventBubble();"/>
oncommand="ViewMenu.setSortColumn(null, 'descending'); event.stopPropagation();"/>
</menupopup>
</menu>
<menu id="helpMenu">

8
content/html/content/src/nsHTMLButtonElement.cpp
Просмотреть файл

@ -423,14 +423,8 @@ nsHTMLButtonElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
case NS_MOUSE_RIGHT_BUTTON_DOWN:
case NS_MOUSE_RIGHT_BUTTON_UP:
{
nsCOMPtr<nsIDOMNSEvent> nsevent;
if (aVisitor.mDOMEvent) {
nsevent = do_QueryInterface(aVisitor.mDOMEvent);
}
if (nsevent) {
nsevent->PreventBubble();
aVisitor.mDOMEvent->StopPropagation();
} else {
rv = NS_ERROR_FAILURE;
}

6
content/html/content/src/nsHTMLInputElement.cpp
Просмотреть файл

@ -1630,10 +1630,8 @@ nsHTMLInputElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
if (mType == NS_FORM_INPUT_BUTTON ||
mType == NS_FORM_INPUT_RESET ||
mType == NS_FORM_INPUT_SUBMIT) {
nsCOMPtr<nsIDOMNSEvent> nsevent =
do_QueryInterface(aVisitor.mDOMEvent);
if (nsevent) {
nsevent->PreventBubble();
if (aVisitor.mDOMEvent) {
aVisitor.mDOMEvent->StopPropagation();
} else {
rv = NS_ERROR_FAILURE;
}

26
content/xul/content/src/nsXULPopupListener.cpp
Просмотреть файл

@ -297,30 +297,22 @@ XULPopupListenerImpl::PreLaunchPopup(nsIDOMEvent* aMouseEvent)
if (button == 0) {
// Time to launch a popup menu.
LaunchPopup(aMouseEvent);
if (nsevent) {
nsevent->PreventBubble();
}
aMouseEvent->StopPropagation();
aMouseEvent->PreventDefault();
}
break;
case eXULPopupType_context:
// Time to launch a context menu
// Time to launch a context menu
#ifndef NS_CONTEXT_MENU_IS_MOUSEUP
// If the context menu launches on mousedown,
// we have to fire focus on the content we clicked on
FireFocusOnTargetContent(targetNode);
// If the context menu launches on mousedown,
// we have to fire focus on the content we clicked on
FireFocusOnTargetContent(targetNode);
#endif
LaunchPopup(aMouseEvent);
if (nsevent) {
nsevent->PreventBubble();
}
aMouseEvent->PreventDefault();
break;
LaunchPopup(aMouseEvent);
aMouseEvent->StopPropagation();
aMouseEvent->PreventDefault();
break;
}
xulDocument->SetPopupEvent(nsnull);
return NS_OK;

22
editor/libeditor/text/nsEditorEventListeners.cpp
Просмотреть файл

@ -356,9 +356,9 @@ nsTextEditorMouseListener::MouseClick(nsIDOMEvent* aMouseEvent)
else
editor->Paste(clipboard);
// Prevent the event from bubbling up to be possibly handled
// Prevent the event from propagating up to be possibly handled
// again by the containing window:
nsevent->PreventBubble();
mouseEvent->StopPropagation();
mouseEvent->PreventDefault();
// We processed the event, whether drop/paste succeeded or not
@ -652,11 +652,7 @@ nsTextEditorDragListener::DragDrop(nsIDOMEvent* aMouseEvent)
return NS_OK;
}
//some day we want to use another way to stop this from bubbling.
nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aMouseEvent));
if (nsevent)
nsevent->PreventBubble();
aMouseEvent->StopPropagation();
aMouseEvent->PreventDefault();
return mEditor->InsertFromDrop(aMouseEvent);
}
@ -1012,6 +1008,7 @@ IsTargetFocused(nsIDOMEventTarget* aTarget)
nsresult
nsTextEditorFocusListener::Focus(nsIDOMEvent* aEvent)
{
NS_ENSURE_ARG(aEvent);
// It's possible for us to receive a focus when we're really not focused.
// This happens, for example, when an onfocus handler that's hooked up
// before this listener focuses something else. In that case, all of the
@ -1029,10 +1026,7 @@ nsTextEditorFocusListener::Focus(nsIDOMEvent* aEvent)
// turn on selection and caret
if (mEditor)
{
nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aEvent));
if (nsevent) {
nsevent->PreventBubble();
}
aEvent->StopPropagation();
PRUint32 flags;
mEditor->GetFlags(&flags);
@ -1077,13 +1071,11 @@ nsTextEditorFocusListener::Focus(nsIDOMEvent* aEvent)
nsresult
nsTextEditorFocusListener::Blur(nsIDOMEvent* aEvent)
{
NS_ENSURE_ARG(aEvent);
// turn off selection and caret
if (mEditor)
{
nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aEvent));
if (nsevent) {
nsevent->PreventBubble();
}
aEvent->StopPropagation();
// when imeEditor exists, call ForceCompositionEnd() to tell
// the input focus is leaving first

4
editor/libeditor/text/nsPlaintextDataTransfer.cpp
Просмотреть файл

@ -408,9 +408,7 @@ NS_IMETHODIMP nsPlaintextEditor::DoDrag(nsIDOMEvent *aDragEvent)
rv = dragService->InvokeDragSession(domnode, transferableArray, nsnull, flags);
if (NS_FAILED(rv)) return rv;
nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aDragEvent));
if (nsevent)
nsevent->PreventBubble();
aDragEvent->StopPropagation();
return rv;
}

4
editor/ui/dialogs/content/EdImageMapShapes.js
Просмотреть файл

@ -212,7 +212,7 @@ function addPoint(event, pointX, pointY, start){
dump('addPoint Called with event\n');
pointX = event.clientX+window.frames[0].pageXOffset;
pointY = event.clientY+window.frames[0].pageYOffset;
event.preventBubble();
event.stopPropagation();
if (event.detail == 2){
polyFinish();
return;
@ -281,7 +281,7 @@ function polyFinish(event, construct){
else
deleteElement(currentPoly);
if (event)
event.preventBubble();
event.stopPropagation();
currentPoly = null;
}

4
extensions/venkman/resources/content/venkman-views.js
Просмотреть файл

@ -3092,8 +3092,8 @@ console.views.source2.onCloseButton =
function s2v_onclose(e)
{
var index = this.getIndexOfTab(e.target.parentNode);
this.removeSourceTabAtIndex(index);
e.preventBubble()
this.removeSourceTabAtIndex(index);
e.stopPropagation();
}
console.views.source2.onTabClick =

25
layout/forms/nsListControlFrame.cpp
Просмотреть файл

@ -2245,13 +2245,7 @@ nsListControlFrame::MouseUp(nsIDOMEvent* aMouseEvent)
if (IsInDropDownMode()) {
if (!IgnoreMouseEventForSelection(aMouseEvent)) {
aMouseEvent->PreventDefault();
nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aMouseEvent));
if (nsevent) {
nsevent->PreventCapture();
nsevent->PreventBubble();
}
aMouseEvent->StopPropagation();
} else {
CaptureMouseEvents(PR_FALSE);
return NS_OK;
@ -2295,14 +2289,7 @@ nsListControlFrame::MouseUp(nsIDOMEvent* aMouseEvent)
IsOptionDisabled(selectedIndex, isDisabled);
if (isDisabled) {
aMouseEvent->PreventDefault();
nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aMouseEvent));
if (nsevent) {
nsevent->PreventCapture();
nsevent->PreventBubble();
}
aMouseEvent->StopPropagation();
CaptureMouseEvents(PR_FALSE);
return NS_ERROR_FAILURE;
}
@ -2520,13 +2507,7 @@ nsListControlFrame::MouseDown(nsIDOMEvent* aMouseEvent)
if (IsInDropDownMode()) {
if (!IgnoreMouseEventForSelection(aMouseEvent)) {
aMouseEvent->PreventDefault();
nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aMouseEvent));
if (nsevent) {
nsevent->PreventCapture();
nsevent->PreventBubble();
}
aMouseEvent->StopPropagation();
} else {
return NS_OK;
}

4
layout/forms/resources/content/select.xml
Просмотреть файл

@ -729,13 +729,13 @@
<handler event="underflow">
<![CDATA[
this.childNodes[1].setAttribute("disabled", true);
event.preventBubble();
event.stopPropagation();
]]>
</handler>
<handler event="overflow">
<![CDATA[
this.childNodes[1].removeAttribute("disabled");
event.preventBubble();
event.stopPropagation();
]]>
</handler>
</handlers>

51
layout/generic/nsObjectFrame.cpp
Просмотреть файл

@ -2620,12 +2620,7 @@ nsresult nsPluginInstanceOwner::DispatchFocusToPlugin(nsIDOMEvent* aFocusEvent)
nsEventStatus rv = ProcessEvent(focusEvent);
if (nsEventStatus_eConsumeNoDefault == rv) {
aFocusEvent->PreventDefault();
nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aFocusEvent));
if (nsevent) {
nsevent->PreventBubble();
}
aFocusEvent->StopPropagation();
}
}
else NS_ASSERTION(PR_FALSE, "nsPluginInstanceOwner::DispatchFocusToPlugin failed, focusEvent null");
@ -2641,10 +2636,7 @@ nsresult nsPluginInstanceOwner::DragEnter(nsIDOMEvent* aMouseEvent)
if (mInstance) {
// Let the plugin handle drag events.
aMouseEvent->PreventDefault();
nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aMouseEvent));
if (nsevent) {
nsevent->PreventBubble();
}
aMouseEvent->StopPropagation();
}
return NS_OK;
@ -2655,10 +2647,7 @@ nsresult nsPluginInstanceOwner::DragOver(nsIDOMEvent* aMouseEvent)
if (mInstance) {
// Let the plugin handle drag events.
aMouseEvent->PreventDefault();
nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aMouseEvent));
if (nsevent) {
nsevent->PreventBubble();
}
aMouseEvent->StopPropagation();
}
return NS_OK;
@ -2669,10 +2658,7 @@ nsresult nsPluginInstanceOwner::DragExit(nsIDOMEvent* aMouseEvent)
if (mInstance) {
// Let the plugin handle drag events.
aMouseEvent->PreventDefault();
nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aMouseEvent));
if (nsevent) {
nsevent->PreventBubble();
}
aMouseEvent->StopPropagation();
}
return NS_OK;
@ -2683,10 +2669,7 @@ nsresult nsPluginInstanceOwner::DragDrop(nsIDOMEvent* aMouseEvent)
if (mInstance) {
// Let the plugin handle drag events.
aMouseEvent->PreventDefault();
nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aMouseEvent));
if (nsevent) {
nsevent->PreventBubble();
}
aMouseEvent->StopPropagation();
}
return NS_OK;
@ -2697,10 +2680,7 @@ nsresult nsPluginInstanceOwner::DragGesture(nsIDOMEvent* aMouseEvent)
if (mInstance) {
// Let the plugin handle drag events.
aMouseEvent->PreventDefault();
nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aMouseEvent));
if (nsevent) {
nsevent->PreventBubble();
}
aMouseEvent->StopPropagation();
}
return NS_OK;
@ -2757,10 +2737,7 @@ nsresult nsPluginInstanceOwner::KeyPress(nsIDOMEvent* aKeyEvent)
// If this event is going to the plugin, we want to kill it.
// Not actually sending keypress to the plugin, since we didn't before.
aKeyEvent->PreventDefault();
nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aKeyEvent));
if (nsevent) {
nsevent->PreventBubble();
}
aKeyEvent->StopPropagation();
}
return NS_OK;
#endif
@ -2783,12 +2760,7 @@ nsresult nsPluginInstanceOwner::DispatchKeyToPlugin(nsIDOMEvent* aKeyEvent)
nsEventStatus rv = ProcessEvent(*keyEvent);
if (nsEventStatus_eConsumeNoDefault == rv) {
aKeyEvent->PreventDefault();
nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aKeyEvent));
if (nsevent) {
nsevent->PreventBubble();
}
aKeyEvent->StopPropagation();
}
}
else NS_ASSERTION(PR_FALSE, "nsPluginInstanceOwner::DispatchKeyToPlugin failed, keyEvent null");
@ -2916,12 +2888,7 @@ nsresult nsPluginInstanceOwner::DispatchMouseToPlugin(nsIDOMEvent* aMouseEvent)
nsEventStatus rv = ProcessEvent(*mouseEvent);
if (nsEventStatus_eConsumeNoDefault == rv) {
aMouseEvent->PreventDefault();
nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aMouseEvent));
if (nsevent) {
nsevent->PreventBubble();
}
aMouseEvent->StopPropagation();
}
}
else NS_ASSERTION(PR_FALSE, "nsPluginInstanceOwner::DispatchMouseToPlugin failed, mouseEvent null");

23
layout/xul/base/src/nsMenuBarListener.cpp
Просмотреть файл

@ -170,13 +170,7 @@ nsMenuBarListener::KeyUp(nsIDOMEvent* aKeyEvent)
PRBool active = mMenuBarFrame->IsActive();
if (active) {
nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aKeyEvent));
if (nsevent) {
nsevent->PreventBubble();
nsevent->PreventCapture();
}
aKeyEvent->StopPropagation();
aKeyEvent->PreventDefault();
return NS_ERROR_BASE; // I am consuming event
}
@ -217,7 +211,6 @@ nsMenuBarListener::KeyPress(nsIDOMEvent* aKeyEvent)
if (mAccessKey)
{
nsCOMPtr<nsIDOMNSUIEvent> nsUIEvent = do_QueryInterface(aKeyEvent);
nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aKeyEvent));
PRBool preventDefault;
@ -243,13 +236,9 @@ nsMenuBarListener::KeyPress(nsIDOMEvent* aKeyEvent)
mMenuBarFrame->ShortcutNavigation(keyEvent, active);
if (active) {
if (nsevent) {
nsevent->PreventBubble();
nsevent->PreventCapture();
}
aKeyEvent->StopPropagation();
aKeyEvent->PreventDefault();
retVal = NS_ERROR_BASE; // I am consuming event
}
}
@ -261,11 +250,7 @@ nsMenuBarListener::KeyPress(nsIDOMEvent* aKeyEvent)
// In Windows, both of these activate the menu bar.
mMenuBarFrame->ToggleMenuActiveState();
if (nsevent) {
nsevent->PreventBubble();
nsevent->PreventCapture();
}
aKeyEvent->StopPropagation();
aKeyEvent->PreventDefault();
return NS_ERROR_BASE; // consume the event
}

8
layout/xul/base/src/nsMenuListener.cpp
Просмотреть файл

@ -91,13 +91,7 @@ nsMenuListener::~nsMenuListener()
nsresult
nsMenuListener::KeyUp(nsIDOMEvent* aKeyEvent)
{
nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aKeyEvent));
if (nsevent) {
nsevent->PreventBubble();
nsevent->PreventCapture();
}
aKeyEvent->StopPropagation();
aKeyEvent->PreventDefault();
return NS_ERROR_BASE; // I am consuming event

2
mail/base/content/FilterListDialog.js
Просмотреть файл

@ -612,7 +612,7 @@ function onFilterClick(event)
if (row.value == -1 || row.value > filterTree.view.rowCount-1 || event.originalTarget.localName != "treechildren") {
if (event.originalTarget.localName == "treecol") {
// clicking on the name column in the filter list should not sort
event.preventBubble();
event.stopPropagation();
}
return;
}

2
mail/base/content/mailWindowOverlay.js
Просмотреть файл

@ -2052,7 +2052,7 @@ function GetMessagesForAccount(aEvent)
var uri = aEvent.target.id;
var server = GetServer(uri);
GetMessagesForInboxOnServer(server);
aEvent.preventBubble();
aEvent.stopPropagation();
}

14
mail/base/content/mailWindowOverlay.xul
Просмотреть файл

@ -257,7 +257,7 @@
oncommandupdate="goUpdateMailMenuItems(this)">
<command id="cmd_getMsgsForAuthAccounts"
oncommand="goDoCommand('cmd_getMsgsForAuthAccounts'); event.preventBubble()"
oncommand="goDoCommand('cmd_getMsgsForAuthAccounts'); event.stopPropagation()"
disabled="true"/>
</commandset>
@ -266,13 +266,13 @@
events="create-menu-mark"
oncommandupdate="goUpdateMailMenuItems(this)">
<command id="cmd_markAsRead" oncommand="goDoCommand('cmd_markAsRead'); event.preventBubble()" disabled="true"/>
<command id="cmd_markAllRead" oncommand="goDoCommand('cmd_markAllRead'); event.preventBubble()" disabled="true"/>
<command id="cmd_markThreadAsRead" oncommand="goDoCommand('cmd_markThreadAsRead'); event.preventBubble()" disabled="true"/>
<command id="cmd_markAsRead" oncommand="goDoCommand('cmd_markAsRead'); event.stopPropagation()" disabled="true"/>
<command id="cmd_markAllRead" oncommand="goDoCommand('cmd_markAllRead'); event.stopPropagation()" disabled="true"/>
<command id="cmd_markThreadAsRead" oncommand="goDoCommand('cmd_markThreadAsRead'); event.stopPropagation()" disabled="true"/>
<command id="cmd_markReadByDate" oncommand="goDoCommand('cmd_markReadByDate');" disabled="true"/>
<command id="cmd_markAsFlagged" oncommand="goDoCommand('cmd_markAsFlagged'); event.preventBubble()" disabled="true"/>
<command id="cmd_markAsJunk" oncommand="goDoCommand('cmd_markAsJunk'); event.preventBubble()" disabled="true"/>
<command id="cmd_markAsNotJunk" oncommand="goDoCommand('cmd_markAsNotJunk'); event.preventBubble()" disabled="true"/>
<command id="cmd_markAsFlagged" oncommand="goDoCommand('cmd_markAsFlagged'); event.stopPropagation()" disabled="true"/>
<command id="cmd_markAsJunk" oncommand="goDoCommand('cmd_markAsJunk'); event.stopPropagation()" disabled="true"/>
<command id="cmd_markAsNotJunk" oncommand="goDoCommand('cmd_markAsNotJunk'); event.stopPropagation()" disabled="true"/>
<command id="cmd_recalculateJunkScore" oncommand="goDoCommand('cmd_recalculateJunkScore');" disabled="true"/>
</commandset>

8
mail/base/content/msgMail3PaneWindow.js
Просмотреть файл

@ -1358,7 +1358,7 @@ function ChangeSelectionWithoutContentLoad(event, tree)
if(tree.id == "threadTree")
gThreadPaneCurrentSelectedIndex = row;
}
event.preventBubble();
event.stopPropagation();
}
function TreeOnMouseDown(event)
@ -1389,7 +1389,7 @@ function FolderPaneOnClick(event)
if (row.value == -1) {
if (event.originalTarget.localName == "treecol") {
// clicking on the name column in the folder pane should not sort
event.preventBubble();
event.stopPropagation();
CycleFolderView(); // needed to cycle the folder view for the old school tree col users
}
return;
@ -1420,7 +1420,7 @@ function FolderPaneOnClick(event)
}
else if ((event.originalTarget.localName == "slider") ||
(event.originalTarget.localName == "scrollbarbutton")) {
event.preventBubble();
event.stopPropagation();
}
else if (event.detail == 2) {
FolderPaneDoubleClick(row.value, event);
@ -1452,7 +1452,7 @@ function FolderPaneDoubleClick(folderIndex, event)
// double clicking should not toggle the open / close state of the
// folder. this will happen if we don't prevent the event from
// bubbling to the default handler in tree.xml
event.preventBubble();
event.stopPropagation();
}
}

2
mail/components/addrbook/content/abCommon.js
Просмотреть файл

@ -626,7 +626,7 @@ function DirPaneClick(event)
// if the user clicks on the header / trecol, do nothing
if (event.originalTarget.localName == "treecol") {
event.preventBubble();
event.stopPropagation();
return;
}
}

2
mail/components/compose/content/MsgComposeCommands.js
Просмотреть файл

@ -2277,7 +2277,7 @@ function changeLanguage(event)
InlineSpellChecker.checkDocument(window.content.document);
}
event.preventBubble();
event.stopPropagation();
}
function ToggleReturnReceipt(target)

6
mail/components/compose/content/addressingWidgetOverlay.js
Просмотреть файл

@ -914,8 +914,10 @@ function awRecipientKeyDown(event, element)
*/
if (!element.value)
awDeleteHit(element);
event.preventBubble(); //We need to stop the event else the listbox will receive it and the function
//awKeyDown will be executed!
// We need to stop the event else the listbox will receive it and the
// function awKeyDown will be executed!
event.stopPropagation();
break;
}
}

4
mail/extensions/newsblog/content/edittree.xml
Просмотреть файл

@ -103,7 +103,7 @@
if (aEvent.keyCode == 27){
tree._assignValueToCell(tree._editOriginalValue,false);
}
aEvent.preventBubble();
aEvent.stopPropagation();
]]>
</body>
</method>
@ -165,7 +165,7 @@
var col = {};
var obj = {};
if(row.value != -1) {
event.preventBubble();
event.stopPropagation();
treeBox.getCellAt(event.clientX,event.clientY,row,col,obj);
this.setEditMode(row.value,col.value,true);
}

2
mailnews/addrbook/resources/content/abCommon.js
Просмотреть файл

@ -622,7 +622,7 @@ function DirPaneClick(event)
// if the user clicks on the header / trecol, do nothing
if (event.originalTarget.localName == "treecol") {
event.preventBubble();
event.stopPropagation();
return;
}

8
mailnews/addrbook/resources/content/abMailListDialog.js
Просмотреть файл

@ -59,8 +59,10 @@ catch (e)
function handleKeyPress(element, event)
{
// allow dialog to close on enter if focused textbox has no value
if (element.value != "" && event.keyCode == 13)
event.preventBubble();
if (element.value != "" && event.keyCode == 13) {
event.stopPropagation();
event.preventDefault();
}
}
function mailingListExists(listname)
@ -365,7 +367,7 @@ function awNotAnEmptyArea(event)
if ( lastInput && lastInput.value )
awAppendNewRow(false);
event.preventBubble();
event.stopPropagation();
}
function awClickEmptySpace(target, setFocus)

2
mailnews/addrbook/resources/content/abSelectAddressesDialog.js
Просмотреть файл

@ -381,7 +381,7 @@ function OnReturnHit(event)
var focusedElement = document.commandDispatcher.focusedElement;
if (focusedElement && (focusedElement.id == "addressBucket"))
return;
event.preventBubble();
event.stopPropagation();
if (focusedElement && (focusedElement.id == "abResultsTree"))
gActivatedButton.doCommand();
}

2
mailnews/base/resources/content/mailWindowOverlay.js
Просмотреть файл

@ -2005,7 +2005,7 @@ function GetMessagesForAccount(aEvent)
var uri = aEvent.target.id;
var server = GetServer(uri);
GetMessagesForInboxOnServer(server);
aEvent.preventBubble();
aEvent.stopPropagation();
}

18
mailnews/base/resources/content/mailWindowOverlay.xul
Просмотреть файл

@ -268,7 +268,7 @@
oncommandupdate="goUpdateMailMenuItems(this)">
<command id="cmd_getMsgsForAuthAccounts"
oncommand="goDoCommand('cmd_getMsgsForAuthAccounts'); event.preventBubble()"
oncommand="goDoCommand('cmd_getMsgsForAuthAccounts'); event.stopPropagation()"
disabled="true"/>
</commandset>
@ -277,16 +277,16 @@
events="create-menu-mark"
oncommandupdate="goUpdateMailMenuItems(this)">
<command id="cmd_markAsRead" oncommand="goDoCommand('cmd_markAsRead'); event.preventBubble()" disabled="true"/>
<command id="cmd_markAllRead" oncommand="goDoCommand('cmd_markAllRead'); event.preventBubble()" disabled="true"/>
<command id="cmd_markThreadAsRead" oncommand="goDoCommand('cmd_markThreadAsRead'); event.preventBubble()" disabled="true"/>
<command id="cmd_markAsRead" oncommand="goDoCommand('cmd_markAsRead'); event.stopPropagation()" disabled="true"/>
<command id="cmd_markAllRead" oncommand="goDoCommand('cmd_markAllRead'); event.stopPropagation()" disabled="true"/>
<command id="cmd_markThreadAsRead" oncommand="goDoCommand('cmd_markThreadAsRead'); event.stopPropagation()" disabled="true"/>
<command id="cmd_markReadByDate" oncommand="goDoCommand('cmd_markReadByDate');" disabled="true"/>
<command id="cmd_markAsFlagged" oncommand="goDoCommand('cmd_markAsFlagged'); event.preventBubble()" disabled="true"/>
<command id="cmd_markAsJunk" oncommand="goDoCommand('cmd_markAsJunk'); event.preventBubble()" disabled="true"/>
<command id="cmd_markAsNotJunk" oncommand="goDoCommand('cmd_markAsNotJunk'); event.preventBubble()" disabled="true"/>
<command id="cmd_markAsFlagged" oncommand="goDoCommand('cmd_markAsFlagged'); event.stopPropagation()" disabled="true"/>
<command id="cmd_markAsJunk" oncommand="goDoCommand('cmd_markAsJunk'); event.stopPropagation()" disabled="true"/>
<command id="cmd_markAsNotJunk" oncommand="goDoCommand('cmd_markAsNotJunk'); event.stopPropagation()" disabled="true"/>
<command id="cmd_recalculateJunkScore" oncommand="goDoCommand('cmd_recalculateJunkScore');" disabled="true"/>
<command id="cmd_markAsShowRemote" oncommand="goDoCommand('cmd_markAsShowRemote'); event.preventBubble()" disabled="true"/>
<command id="cmd_markAsNotPhish" oncommand="goDoCommand('cmd_markAsNotPhish'); event.preventBubble()" disabled="true"/>
<command id="cmd_markAsShowRemote" oncommand="goDoCommand('cmd_markAsShowRemote'); event.stopPropagation()" disabled="true"/>
<command id="cmd_markAsNotPhish" oncommand="goDoCommand('cmd_markAsNotPhish'); event.stopPropagation()" disabled="true"/>
</commandset>
<commandset id="mailLabelMenuItems"

8
mailnews/base/resources/content/msgMail3PaneWindow.js
Просмотреть файл

@ -1234,7 +1234,7 @@ function ChangeSelectionWithoutContentLoad(event, tree)
if(tree.id == "threadTree")
gThreadPaneCurrentSelectedIndex = row;
}
event.preventBubble();
event.stopPropagation();
}
function TreeOnMouseDown(event)
@ -1265,7 +1265,7 @@ function FolderPaneOnClick(event)
if (row.value == -1) {
if (event.originalTarget.localName == "treecol")
// clicking on the name column in the folder pane should not sort
event.preventBubble();
event.stopPropagation();
return;
}
@ -1295,7 +1295,7 @@ function FolderPaneOnClick(event)
}
else if ((event.originalTarget.localName == "slider") ||
(event.originalTarget.localName == "scrollbarbutton")) {
event.preventBubble();
event.stopPropagation();
}
else if (event.detail == 2) {
FolderPaneDoubleClick(row.value, event);
@ -1327,7 +1327,7 @@ function FolderPaneDoubleClick(folderIndex, event)
// double clicking should not toggle the open / close state of the
// folder. this will happen if we don't prevent the event from
// bubbling to the default handler in tree.xml
event.preventBubble();
event.stopPropagation();
}
}

4
mailnews/base/resources/content/threadPane.js
Просмотреть файл

@ -77,7 +77,7 @@ function ThreadPaneOnClick(event)
// double clicking should not toggle the open / close state of the
// thread. this will happen if we don't prevent the event from
// bubbling to the default handler in tree.xml
event.preventBubble();
event.stopPropagation();
}
else if (col.value.id == "junkStatusCol") {
MsgJunkMailInfo(true);
@ -85,7 +85,7 @@ function ThreadPaneOnClick(event)
else if (col.value.id == "threadCol" && !event.shiftKey &&
(event.ctrlKey || event.metaKey)) {
gDBView.ExpandAndSelectThreadByIndex(row.value, true);
event.preventBubble();
event.stopPropagation();
}
}
}

2
mailnews/base/search/resources/content/FilterListDialog.js
Просмотреть файл

@ -602,7 +602,7 @@ function onFilterClick(event)
if (row.value == -1 || row.value > filterTree.view.rowCount-1 || event.originalTarget.localName != "treechildren") {
if (event.originalTarget.localName == "treecol") {
// clicking on the name column in the filter list should not sort
event.preventBubble();
event.stopPropagation();
}
return;
}

6
mailnews/compose/resources/content/addressingWidgetOverlay.js
Просмотреть файл

@ -887,8 +887,10 @@ function awRecipientKeyDown(event, element)
*/
if (!element.value)
awDeleteHit(element);
event.preventBubble(); //We need to stop the event else the listbox will receive it and the function
//awKeyDown will be executed!
//We need to stop the event else the listbox will receive it and the function
//awKeyDown will be executed!
event.stopPropagation();
break;
}
}

6
toolkit/content/nsDragAndDrop.js
Просмотреть файл

@ -434,7 +434,7 @@ var nsDragAndDrop = {
// cancel the drag. even if it's not, there's not much
// we can do, so be silent.
}
aEvent.preventBubble();
aEvent.stopPropagation();
},
/**
@ -462,7 +462,7 @@ var nsDragAndDrop = {
aDragDropObserver.onDragOver(aEvent,
flavourSet.flavourTable[flavour],
this.mDragSession);
aEvent.preventBubble();
aEvent.stopPropagation();
break;
}
}
@ -495,7 +495,7 @@ var nsDragAndDrop = {
var dropData = multiple ? transferData : transferData.first.first;
aDragDropObserver.onDrop(aEvent, dropData, this.mDragSession);
}
aEvent.preventBubble();
aEvent.stopPropagation();
},
/**

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

@ -930,7 +930,7 @@
<xul:spacer class="tabs-right"/>
<xul:hbox hidden="true" anonid="messageClose" class="tabs-closebutton-box"
align="center" pack="end">
<xul:toolbarbutton ondblclick="event.preventBubble();"
<xul:toolbarbutton ondblclick="event.stopPropagation();"
class="tabs-closebutton close-button"
oncommand="this.parentNode.parentNode.hide();"/>
</xul:hbox>

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

@ -160,7 +160,7 @@
}
}
}
aEvent.preventBubble();
aEvent.stopPropagation();
]]>
</body>
</method>

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

@ -297,19 +297,19 @@
</handler>
<handler event="keypress" keycode="VK_UP" phase="target">
this.checkAdjacentElement(false);
event.preventBubble();
event.stopPropagation();
</handler>
<handler event="keypress" keycode="VK_LEFT" phase="target">
this.checkAdjacentElement(false);
event.preventBubble();
event.stopPropagation();
</handler>
<handler event="keypress" keycode="VK_DOWN" phase="target">
this.checkAdjacentElement(true);
event.preventBubble();
event.stopPropagation();
</handler>
<handler event="keypress" keycode="VK_RIGHT" phase="target">
this.checkAdjacentElement(true);
event.preventBubble();
event.stopPropagation();
</handler>
<!-- set a focused attribute on the selected item when the group

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

@ -13,10 +13,10 @@
<binding id="scrollbar-base">
<handlers>
<handler event="contextmenu" preventdefault="true" action="event.preventBubble();"/>
<handler event="click" preventdefault="true" action="event.preventBubble();"/>
<handler event="dblclick" action="event.preventBubble();"/>
<handler event="command" action="event.preventBubble();"/>
<handler event="contextmenu" preventdefault="true" action="event.stopPropagation();"/>
<handler event="click" preventdefault="true" action="event.stopPropagation();"/>
<handler event="dblclick" action="event.stopPropagation();"/>
<handler event="command" action="event.stopPropagation();"/>
</handlers>
</binding>

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

@ -45,20 +45,20 @@
</implementation>
<handlers>
<handler event="DOMMouseScroll" action="this.scrollByIndex(event.detail); event.preventBubble();"/>
<handler event="DOMMouseScroll" action="this.scrollByIndex(event.detail); event.stopPropagation();"/>
<handler event="underflow"><![CDATA[
var kids = document.getAnonymousNodes(this);
kids[0].collapsed = true;
kids[2].collapsed = true;
event.preventBubble();
event.stopPropagation();
]]></handler>
<handler event="overflow"><![CDATA[
var kids = document.getAnonymousNodes(this);
kids[0].collapsed = false;
kids[2].collapsed = false;
event.preventBubble();
event.stopPropagation();
]]></handler>
</handlers>
</binding>

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

@ -460,7 +460,7 @@
<xul:stack>
<xul:spacer class="tabs-right"/>
<xul:hbox class="tabs-closebutton-box" align="center" pack="end">
<xul:toolbarbutton ondblclick="event.preventBubble();" class="tabs-closebutton close-button" xbl:inherits="disabled=disableclose,oncommand=onclosetab"/>
<xul:toolbarbutton ondblclick="event.stopPropagation();" class="tabs-closebutton close-button" xbl:inherits="disabled=disableclose,oncommand=onclosetab"/>
</xul:hbox>
</xul:stack>
</content>

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

@ -2166,7 +2166,7 @@
<parameter name="event"/>
<body>
<![CDATA[
event.preventBubble();
event.stopPropagation();
var tn = document.tooltipNode;
if (tn.localName != "tab")
return false; // Not a tab, so cancel the tooltip

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

@ -276,7 +276,7 @@
this.parentNode.firstChild.focus();
this.parentNode._doPopupItemEnabling(this);"
onpopuphiding="this.parentNode._doPopupItemDisabling(this);"
oncommand="var cmd = event.originalTarget.getAttribute('cmd'); if(cmd) { this.parentNode.doCommand(cmd); event.preventBubble(); }">
oncommand="var cmd = event.originalTarget.getAttribute('cmd'); if(cmd) { this.parentNode.doCommand(cmd); event.stopPropagation(); }">
<xul:menuitem label="&spellNoSuggestions.label;" anonid="spell-no-suggestions" disabled="true"/>
<xul:menuseparator anonid="spell-suggestions-separator"/>
<xul:menuitem label="&spellAddToDictionary.label;" accesskey="&spellAddToDictionary.accesskey;" anonid="spell-add-to-dictionary" oncommand="this.parentNode.parentNode.spellui.addToDictionary();"/>

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

@ -596,7 +596,7 @@
tree.setAttribute("hidehscroll", "true");
else if (event.detail == 0)
tree.setAttribute("hidevscroll", "true");
event.preventBubble();
event.stopPropagation();
]]>
</handler>
<handler event="overflow">
@ -606,7 +606,7 @@
tree.removeAttribute("hidehscroll");
else if (event.detail == 0)
tree.removeAttribute("hidevscroll");
event.preventBubble();
event.stopPropagation();
]]>
</handler>
</handlers>
@ -891,7 +891,7 @@
<parameter name="aEvent"/>
<body><![CDATA[
// prevent click event from firing after column drag and drop
aEvent.preventBubble();
aEvent.stopPropagation();
aEvent.preventDefault();
]]></body>
</method>

196
xpfe/browser/resources/content/linkToolbarOverlay.xul
Просмотреть файл

@ -1,196 +0,0 @@
<?xml version="1.0"?>
<!-- ***** BEGIN LICENSE BLOCK *****
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- The contents of this file are subject to the Mozilla Public License Version
- 1.1 (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
-
- Software distributed under the License is distributed on an "AS IS" basis,
- WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- for the specific language governing rights and limitations under the
- License.
-
- The Original Code is Eric Hodel's <drbrain@segment7.net> code.
-
- The Initial Developer of the Original Code is
- Eric Hodel.
- Portions created by the Initial Developer are Copyright (C) 2001
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
- Christopher Hoess <choess@force.stwing.upenn.edu>
- Tim Taylor <tim@tool-man.org>
- Stuart Ballard <sballard@netreach.net>
-
- Alternatively, the contents of this file may be used under the terms of
- either the GNU General Public License Version 2 or later (the "GPL"), or
- the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- in which case the provisions of the GPL or the LGPL are applicable instead
- of those above. If you wish to allow use of your version of this file only
- under the terms of either the GPL or the LGPL, and not to allow others to
- use your version of this file under the terms of the MPL, indicate your
- decision by deleting the provisions above and replace them with the notice
- and other provisions required by the LGPL or the GPL. If you do not delete
- the provisions above, a recipient may use your version of this file under
- the terms of any one of the MPL, the GPL or the LGPL.
-
- ***** END LICENSE BLOCK ***** -->
<?xml-stylesheet href="chrome://navigator/skin/linkToolbar.css" type="text/css"?>
<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
<!DOCTYPE overlay SYSTEM "chrome://navigator/locale/linkToolbar.dtd">
<overlay id="linkToolbarOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:rdf="http://www.mozilla.org/rdf">
<!-- classes -->
<script type="application/x-javascript" src="chrome://navigator/content/linkToolbarHandler.js" />
<script type="application/x-javascript" src="chrome://navigator/content/linkToolbarItem.js" />
<script type="application/x-javascript" src="chrome://navigator/content/languageDictionary.js" />
<!-- functions -->
<script type="application/x-javascript" src="chrome://navigator/content/linkToolbarOverlay.js" />
<script type="application/x-javascript">
<![CDATA[
document.addEventListener("pageshow", linkToolbarUI.initHandlers, true);
]]>
</script>
<menupopup id="view_toolbars_popup">
<menu label="&linkToolbar.label;" position="3"
accesskey="&linkToolbar.accesskey;"
oncommand="linkToolbarUI.toggleLinkToolbar(event.target)"
onpopupshowing="linkToolbarUI.initLinkbarVisibilityMenu()">
<menupopup>
<menuitem label="&linkToolbarAlways.label;"
accesskey="&linkToolbarAlways.accesskey;"
class="menuitem-iconic" type="radio" value="false"
name="cmd_viewlinktoolbar" id="cmd_viewlinktoolbar_false" />
<menuitem label="&linkToolbarAsNeeded.label;"
accesskey="&linkToolbarAsNeeded.accesskey;"
class="menuitem-iconic" type="radio" value="maybe"
name="cmd_viewlinktoolbar" id="cmd_viewlinktoolbar_maybe" />
<menuitem label="&linkToolbarNever.label;"
accesskey="&linkToolbarNever.accesskey;"
class="menuitem-iconic" type="radio" value="true"
name="cmd_viewlinktoolbar" id="cmd_viewlinktoolbar_true" />
</menupopup>
</menu>
</menupopup>
<toolbox id="navigator-toolbox">
<toolbar id="linktoolbar" class="chromeclass-directories"
oncommand="event.preventBubble(); return linkToolbarUI.commanded(event);"
tbalign="stretch" hidden="true" hasitems="false">
<toolbarbutton id="link-top" class="bookmark-item"
label="&topButton.label;" disabled="true"/>
<toolbarbutton id="link-up" class="bookmark-item"
label="&upButton.label;" disabled="true"/>
<toolbarseparator />
<toolbarbutton id="link-first" class="bookmark-item"
label="&firstButton.label;" disabled="true"/>
<toolbarbutton id="link-prev" class="bookmark-item"
label="&prevButton.label;" disabled="true"/>
<toolbarbutton id="link-next" class="bookmark-item"
label="&nextButton.label;" disabled="true"/>
<toolbarbutton id="link-last" class="bookmark-item"
label="&lastButton.label;" disabled="true"/>
<toolbarseparator />
<toolbarbutton id="document-menu" class="bookmark-item"
type="menu"
container="true"
label="&documentButton.label;" disabled="true">
<menupopup id="document-menu-popup">
<menuitem id="link-toc" label="&tocButton.label;" disabled="true"
class="menuitem-iconic bookmark-item"
rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type" />
<menu id="link-chapter" label="&chapterButton.label;" disabled="true"
class="menu-iconic bookmark-item" container="true"
rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type">
<menupopup id="link-chapter-popup" />
</menu>
<menu id="link-section" label="&sectionButton.label;" disabled="true"
class="menu-iconic bookmark-item" container="true"
rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type">
<menupopup id="link-section-popup" />
</menu>
<menu id="link-subsection" label="&subSectionButton.label;" disabled="true"
class="menu-iconic bookmark-item" container="true"
rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type">
<menupopup id="link-subsection-popup" />
</menu>
<menu id="link-appendix" label="&appendixButton.label;" disabled="true"
class="menu-iconic bookmark-item" container="true"
rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type">
<menupopup id="link-appendix-popup" />
</menu>
<menuitem id="link-glossary" label="&glossaryButton.label;" disabled="true"
class="menuitem-iconic bookmark-item"
rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type" />
<menuitem id="link-index" label="&indexButton.label;" disabled="true"
class="menuitem-iconic bookmark-item"
rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type" />
</menupopup>
</toolbarbutton>
<toolbarbutton id="more-menu" class="bookmark-item"
type="menu"
container="true"
label="&moreButton.label;" disabled="true">
<menupopup id="more-menu-popup">
<menuitem id="link-help" label="&helpButton.label;" disabled="true"
class="menuitem-iconic bookmark-item"
rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type" />
<menuitem id="link-search" label="&searchButton.label;" disabled="true"
class="menuitem-iconic bookmark-item"
rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type" />
<menuseparator />
<menuitem id="link-author" label="&authorButton.label;" disabled="true"
class="menuitem-iconic bookmark-item"
rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type" />
<menuitem id="link-copyright" label="&copyrightButton.label;" disabled="true"
class="menuitem-iconic bookmark-item"
rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type" />
<menuseparator />
<menu id="link-bookmark" label="&bookmarkButton.label;" disabled="true"
class="menu-iconic bookmark-item" container="true"
rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type">
<menupopup id="link-bookmark-popup" />
</menu>
<menuseparator />
<menu id="link-alternate" label="&alternateButton.label;" disabled="true"
class="menu-iconic bookmark-item" container="true"
rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type">
<menupopup id="link-alternate-popup" />
</menu>
<menuseparator collapsed="true" id="misc-separator" />
</menupopup>
</toolbarbutton>
</toolbar>
</toolbox>
</overlay>

19
xpfe/browser/resources/content/navigator.xul
Просмотреть файл

@ -201,7 +201,6 @@
ondraggesture="PageProxyDragGesture(event);"
onload="this.parentNode.selectedIndex = 1;
event.stopPropagation();
event.preventBubble();
HandleBookmarkIcon(this.src, true);"
onerror="gBrowser.addToMissedIconCache(this.src); HandleBookmarkIcon(this.src, false);"
tooltiptext="&proxyIcon.tooltip;"/>
@ -265,10 +264,10 @@
<toolbar id="PersonalToolbar" class="chromeclass-directories" persist="collapsed"
grippytooltiptext="&personalToolbar.tooltip;" tbalign="stretch" prefixhidden="true"
ondraggesture="nsDragAndDrop.startDrag(event, BookmarksMenuDNDObserver)"
ondragdrop="nsDragAndDrop.drop(event, BookmarksMenuDNDObserver); event.preventBubble()"
ondragenter="nsDragAndDrop.dragEnter(event, BookmarksMenuDNDObserver); event.preventBubble()"
ondragexit="nsDragAndDrop.dragExit(event, BookmarksMenuDNDObserver); event.preventBubble()"
ondragover="nsDragAndDrop.dragOver(event, BookmarksMenuDNDObserver); event.preventBubble()">
ondragdrop="nsDragAndDrop.drop(event, BookmarksMenuDNDObserver); event.stopPropagation()"
ondragenter="nsDragAndDrop.dragEnter(event, BookmarksMenuDNDObserver); event.stopPropagation()"
ondragexit="nsDragAndDrop.dragExit(event, BookmarksMenuDNDObserver); event.stopPropagation()"
ondragover="nsDragAndDrop.dragOver(event, BookmarksMenuDNDObserver); event.stopPropagation()">
<tooltip id="home-button-tooltip" noautohide="true">
<vbox id="home-button-tooltip-inner" flex="1"/>
@ -279,10 +278,10 @@
onclick="if (event.button == 1) BrowserHome(event);"
tooltip="home-button-tooltip"
ondraggesture="nsDragAndDrop.startDrag(event, homeButtonObserver)"
ondragdrop="nsDragAndDrop.drop(event, homeButtonObserver); event.preventBubble()"
ondragenter="event.preventBubble()"
ondragexit="nsDragAndDrop.dragExit(event, homeButtonObserver); event.preventBubble()"
ondragover="nsDragAndDrop.dragOver(event, homeButtonObserver); event.preventBubble()"/>
ondragdrop="nsDragAndDrop.drop(event, homeButtonObserver); event.stopPropagation()"
ondragenter="event.stopPropagation()"
ondragexit="nsDragAndDrop.dragExit(event, homeButtonObserver); event.stopPropagation()"
ondragover="nsDragAndDrop.dragOver(event, homeButtonObserver); event.stopPropagation()"/>
<toolbarseparator id="home-bm-separator"/>
@ -295,7 +294,7 @@
oncommand="BookmarksMenu.loadBookmark(event, this.database);"
onclick="BookmarksMenu.loadBookmarkMiddleClick(event, this.database)"
template="bookmarksMenuTemplate"
ondraggesture="if (event.target.id=='bookmarks-button') event.preventBubble()">
ondraggesture="if (event.target.id=='bookmarks-button') event.stopPropagation()">
<menupopup onpopupshowing="updateGroupmarkCommand();">
<menuitem command="Browser:AddBookmark"/>
<menuitem command="Browser:AddBookmarkAs"/>

12
xpfe/browser/resources/content/navigatorOverlay.xul
Просмотреть файл

@ -184,7 +184,7 @@
oncommand="addBookmarkAs();"/>
<command id="Browser:AddGroupmarkAs" label="&addCurTabsAsCmd.label;"
accesskey="&addCurTabsAsCmd.accesskey;"
oncommand="addGroupmarkAs(); event.preventBubble();"/>
oncommand="addGroupmarkAs(); event.stopPropagation();"/>
<command id="Browser:ManageBookmark" label="&manBookmarksCmd.label;" accesskey="&manBookmarksCmd.accesskey;"
oncommand="BrowserEditBookmarks();" />
@ -415,7 +415,7 @@
<menu label="&useStyleSheetMenu.label;" accesskey="&useStyleSheetMenu.accesskey;" disabled="false" observes="isImage">
<menupopup onpopupshowing="stylesheetFillPopup(this);"
oncommand="stylesheetSwitchAll(window.content, event.target.getAttribute('data')); setStyleDisabled(false);" type="radio">
<menuitem label="&useStyleSheetNone.label;" accesskey="&useStyleSheetNone.accesskey;" oncommand="setStyleDisabled(true); event.preventBubble();" type="radio"/>
<menuitem label="&useStyleSheetNone.label;" accesskey="&useStyleSheetNone.accesskey;" oncommand="setStyleDisabled(true); event.stopPropagation();" type="radio"/>
<menuitem label="&useStyleSheetPersistentOnly.label;" accesskey="&useStyleSheetPersistentOnly.accesskey;" type="radio"/>
</menupopup>
</menu>
@ -466,10 +466,10 @@
oncommand="BookmarksMenu.loadBookmark(event, this.database)"
onclick="BookmarksMenu.loadBookmarkMiddleClick(event, this.database)"
ondraggesture="nsDragAndDrop.startDrag(event, BookmarksMenuDNDObserver)"
ondragdrop="nsDragAndDrop.drop(event, BookmarksMenuDNDObserver); event.preventBubble()"
ondragenter="nsDragAndDrop.dragEnter(event, BookmarksMenuDNDObserver); event.preventBubble()"
ondragexit="nsDragAndDrop.dragExit(event, BookmarksMenuDNDObserver); event.preventBubble()"
ondragover="nsDragAndDrop.dragOver(event, BookmarksMenuDNDObserver); event.preventBubble()">
ondragdrop="nsDragAndDrop.drop(event, BookmarksMenuDNDObserver); event.stopPropagation()"
ondragenter="nsDragAndDrop.dragEnter(event, BookmarksMenuDNDObserver); event.stopPropagation()"
ondragexit="nsDragAndDrop.dragExit(event, BookmarksMenuDNDObserver); event.stopPropagation()"
ondragover="nsDragAndDrop.dragOver(event, BookmarksMenuDNDObserver); event.stopPropagation()">
<menupopup id="menu_BookmarksPopup"
onpopupshowing="updateGroupmarkCommand();">
<menuitem key="addBookmarkKb" command="Browser:AddBookmark"/>

10
xpfe/communicator/resources/content/contentAreaClick.js
Просмотреть файл

@ -180,7 +180,7 @@
var href = ceParams.href;
if (isKeyPress) {
openNewTabWith(href, true, event.shiftKey);
event.preventBubble();
event.stopPropagation();
}
else {
handleLinkClick(event, href, ceParams.linkNode);
@ -196,7 +196,7 @@
!event.getPreventDefault() &&
pref.getBoolPref("middlemouse.contentLoadURL")) {
if (middleMousePaste(event)) {
event.preventBubble();
event.stopPropagation();
}
}
return true;
@ -243,14 +243,14 @@
// should we open it in a new tab?
if (pref && pref.getBoolPref("browser.tabs.opentabfor.middleclick")) {
openNewTabWith(href, sendReferrer, event.shiftKey);
event.preventBubble();
event.stopPropagation();
return true;
}
// should we open it in a new window?
if (pref && pref.getBoolPref("middlemouse.openNewWindow")) {
openNewWindowWith(href, sendReferrer);
event.preventBubble();
event.stopPropagation();
return true;
}
@ -341,7 +341,7 @@
loadURI(url);
}
event.preventBubble();
event.stopPropagation();
return true;
}

4
xpfe/components/bookmarks/resources/bookmarksManager.js
Просмотреть файл

@ -123,7 +123,7 @@ function fillColumnsMenu(aEvent)
}
}
aEvent.preventBubble();
aEvent.stopPropagation();
}
function onViewMenuColumnItemSelected(aEvent)
@ -134,7 +134,7 @@ function onViewMenuColumnItemSelected(aEvent)
bookmarksView.toggleColumnVisibility(colid);
}
aEvent.preventBubble();
aEvent.stopPropagation();
}
function OpenBookmarksFile()

4
xpfe/components/bookmarks/resources/bookmarksManager.xul
Просмотреть файл

@ -213,12 +213,12 @@
<menuitem id="viewCommandToolbar" type="checkbox" class="menuitem-iconic"
label="&menuitem.view.command.toolbar.label;"
accesskey="&menuitem.view.command.toolbar.accesskey;"
oncommand="goToggleToolbar('command-toolbar', 'viewCommandToolbar'); event.preventBubble();"
oncommand="goToggleToolbar('command-toolbar', 'viewCommandToolbar'); event.stopPropagation();"
checked="true"/>
<menuitem id="viewCommandSearchbar" type="checkbox" class="menuitem-iconic"
label="&menuitem.view.command.searchbar.label;"
accesskey="&menuitem.view.command.searchbar.accesskey;"
oncommand="goToggleToolbar('bookmarks-search', 'viewCommandSearchbar'); event.preventBubble();"
oncommand="goToggleToolbar('bookmarks-search', 'viewCommandSearchbar'); event.stopPropagation();"
checked="true"/>
<menu label="&menuitem.view.show_columns.label;"
accesskey="&menuitem.view.show_columns.accesskey;">

8
xpfe/components/bookmarks/resources/bookmarksTree.xml
Просмотреть файл

@ -724,8 +724,8 @@
<!-- context menu -->
<menupopup onpopupshowing="this.parentNode.createTreeContextMenu(event);"
onpopuphidden="if (content) content.focus()"
onclick="event.preventBubble();"
onkeypress="event.preventBubble();"/>
onclick="event.stopPropagation();"
onkeypress="event.stopPropagation();"/>
<vbox flex="1">
<tree anonid="bookmarks-tree" flex="1" class="plain" enableColumnDrag="true"
datasources="rdf:bookmarks rdf:internetsearch rdf:localsearch" ref="NC:BookmarksTopRoot" flags="dont-build-content"
@ -840,8 +840,8 @@
<menupopup xbl:inherits="onpopupshowing"
onpopupshowing="this.parentNode.createTreeContextMenu(event);"
onpopuphidden="if (content) content.focus()"
onclick="event.preventBubble();"
onkeypress="event.preventBubble();"/>
onclick="event.stopPropagation();"
onkeypress="event.stopPropagation();"/>
<tree anonid="bookmarks-tree" flex="1" class="plain" hidecolumnpicker="true"
datasources="rdf:bookmarks rdf:internetsearch rdf:localsearch" ref="NC:BookmarksRoot" flags="dont-build-content"
onselect="this.parentNode.treeBoxObject.view.selectionChanged();" seltype="single">

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

@ -160,7 +160,7 @@
}
}
}
aEvent.preventBubble();
aEvent.stopPropagation();
]]>
</body>
</method>

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

@ -297,19 +297,19 @@
</handler>
<handler event="keypress" keycode="VK_UP" phase="target">
this.checkAdjacentElement(false);
event.preventBubble();
event.stopPropagation();
</handler>
<handler event="keypress" keycode="VK_LEFT" phase="target">
this.checkAdjacentElement(false);
event.preventBubble();
event.stopPropagation();
</handler>
<handler event="keypress" keycode="VK_DOWN" phase="target">
this.checkAdjacentElement(true);
event.preventBubble();
event.stopPropagation();
</handler>
<handler event="keypress" keycode="VK_RIGHT" phase="target">
this.checkAdjacentElement(true);
event.preventBubble();
event.stopPropagation();
</handler>
<!-- set a focused attribute on the selected item when the group

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

@ -13,10 +13,10 @@
<binding id="scrollbar-base">
<handlers>
<handler event="contextmenu" preventdefault="true" action="event.preventBubble();"/>
<handler event="click" preventdefault="true" action="event.preventBubble();"/>
<handler event="dblclick" action="event.preventBubble();"/>
<handler event="command" action="event.preventBubble();"/>
<handler event="contextmenu" preventdefault="true" action="event.stopPropagation();"/>
<handler event="click" preventdefault="true" action="event.stopPropagation();"/>
<handler event="dblclick" action="event.stopPropagation();"/>
<handler event="command" action="event.stopPropagation();"/>
</handlers>
</binding>

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

@ -27,7 +27,7 @@
<children/>
</xul:scrollbox>
<xul:autorepeatbutton class="autorepeatbutton-down" collapsed="true"
oncommand="this.parentNode.scrollByIndex(1); event.preventBubble();"/>
oncommand="this.parentNode.scrollByIndex(1); event.stopPropagation();"/>
</content>
<implementation>
@ -45,20 +45,20 @@
</implementation>
<handlers>
<handler event="DOMMouseScroll" action="this.scrollByIndex(event.detail); event.preventBubble();"/>
<handler event="DOMMouseScroll" action="this.scrollByIndex(event.detail); event.stopPropagation();"/>
<handler event="underflow"><![CDATA[
var kids = document.getAnonymousNodes(this);
kids[0].collapsed = true;
kids[2].collapsed = true;
event.preventBubble();
event.stopPropagation();
]]></handler>
<handler event="overflow"><![CDATA[
var kids = document.getAnonymousNodes(this);
kids[0].collapsed = false;
kids[2].collapsed = false;
event.preventBubble();
event.stopPropagation();
]]></handler>
</handlers>
</binding>

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

@ -424,7 +424,7 @@
<content>
<xul:stack>
<xul:spacer class="tabs-left"/>
<xul:toolbarbutton ondblclick="event.preventBubble();" class="tabs-newbutton" xbl:inherits="oncommand=onnewtab,tooltiptext=tooltiptextnew"/>
<xul:toolbarbutton ondblclick="event.stopPropagation();" class="tabs-newbutton" xbl:inherits="oncommand=onnewtab,tooltiptext=tooltiptextnew"/>
</xul:stack>
<xul:hbox flex="1" style="min-width: 1px; overflow: -moz-hidden-unscrollable;">
<children/>
@ -433,7 +433,7 @@
<xul:stack>
<xul:spacer class="tabs-right"/>
<xul:hbox class="tabs-closebutton-box" align="center" pack="end">
<xul:toolbarbutton ondblclick="event.preventBubble();" class="tabs-closebutton close-button" xbl:inherits="disabled=disableclose,oncommand=onclosetab"/>
<xul:toolbarbutton ondblclick="event.stopPropagation();" class="tabs-closebutton close-button" xbl:inherits="disabled=disableclose,oncommand=onclosetab"/>
</xul:hbox>
</xul:stack>
</content>

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

@ -65,7 +65,7 @@
ondragover="nsDragAndDrop.dragOver(event, this.parentNode.parentNode); event.stopPropagation();"
ondragdrop="nsDragAndDrop.drop(event, this.parentNode.parentNode); event.stopPropagation();"
ondragexit="nsDragAndDrop.dragExit(event, this.parentNode.parentNode); event.stopPropagation();">
<xul:tooltip onpopupshowing="event.preventBubble(); if (document.tooltipNode.hasAttribute('label')) { this.setAttribute('label', document.tooltipNode.getAttribute('label')); return true; } return false;"/>
<xul:tooltip onpopupshowing="event.stopPropagation(); if (document.tooltipNode.hasAttribute('label')) { this.setAttribute('label', document.tooltipNode.getAttribute('label')); return true; } return false;"/>
<xul:menupopup onpopupshowing="this.parentNode.parentNode.parentNode.updatePopupMenu(this);">
<xul:menuitem label="&closeTab.label;" accesskey="&closeTab.accesskey;"
tbattr="tabbrowser-multiple"

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

@ -231,7 +231,7 @@
onpopupshowing="if (document.commandDispatcher.focusedElement != this.parentNode.firstChild)
this.parentNode.firstChild.focus();
this.parentNode.doPopupItemEnabling(this);"
oncommand="this.parentNode.doCommand(event.originalTarget.getAttribute('cmd'));event.preventBubble();">
oncommand="this.parentNode.doCommand(event.originalTarget.getAttribute('cmd'));event.stopPropagation();">
<xul:menuitem label="&undoCmd.label;" accesskey="&undoCmd.accesskey;" cmd="cmd_undo"/>
<xul:menuseparator/>
<xul:menuitem label="&cutCmd.label;" accesskey="&cutCmd.accesskey;" cmd="cmd_cut"/>

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

@ -568,7 +568,7 @@
tree.setAttribute("hidehscroll", "true");
else if (event.detail == 0)
tree.setAttribute("hidevscroll", "true");
event.preventBubble();
event.stopPropagation();
]]>
</handler>
<handler event="overflow">
@ -578,7 +578,7 @@
tree.removeAttribute("hidehscroll");
else if (event.detail == 0)
tree.removeAttribute("hidevscroll");
event.preventBubble();
event.stopPropagation();
]]>
</handler>
</handlers>
@ -862,7 +862,7 @@
<parameter name="aEvent"/>
<body><![CDATA[
// prevent click event from firing after column drag and drop
aEvent.preventBubble();
aEvent.stopPropagation();
aEvent.preventDefault();
]]></body>
</method>

6
xpfe/global/resources/content/nsDragAndDrop.js
Просмотреть файл

@ -176,7 +176,7 @@ var nsDragAndDrop = {
// cancel the drag. even if it's not, there's not much
// we can do, so be silent.
}
aEvent.preventBubble();
aEvent.stopPropagation();
},
/**
@ -204,7 +204,7 @@ var nsDragAndDrop = {
aDragDropObserver.onDragOver(aEvent,
flavourSet.flavourTable[flavour],
this.mDragSession);
aEvent.preventBubble();
aEvent.stopPropagation();
break;
}
}
@ -237,7 +237,7 @@ var nsDragAndDrop = {
var dropData = multiple ? transferData : transferData.first.first;
aDragDropObserver.onDrop(aEvent, dropData, this.mDragSession);
}
aEvent.preventBubble();
aEvent.stopPropagation();
},
/**