Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@192998 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
Olli.Pettay%helsinki.fi
2006-03-25 22:03:49 +00:00
parent 2a0d15e8b9
commit ed6f59a4d7
65 changed files with 207 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/browser/base/content/browser-menubar.inc
View File

@@ -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
mozilla/browser/base/content/browser.js
View File

@@ -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
mozilla/browser/base/content/browser.xul
View File

@@ -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>