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

the focus should be set to the content before executing a command that opens a modal dialog. When the dialog closes, focus automatically gets back to the focused element in the parent window. This fix will prevent the edit menu (undo, redo, delete...) to perform bm command.

Browse Source 
Fix a harmless js error also.


git-svn-id: svn://10.0.0.236/trunk@150462 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
chanial%noos.fr 2003-12-19 03:19:04 +00:00
parent ac8b33b036
commit dafb60d70a
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mozilla/browser/components/bookmarks/content/bookmarksMenu.js
View File

@ -144,8 +144,9 @@ var BookmarksMenu = {
// Clean up after closing the context menu popup
destroyContextMenu: function (aEvent)
{
if (content)
content.focus()
# let''s focus the content (needed) when the user escape it
if (content)
content.focus();
BookmarksMenuDNDObserver.onDragRemoveFeedBack(document.popupNode); // needed on cancel
aEvent.target.removeEventListener("mousemove", BookmarksMenuController.onMouseMove, false)
// XXXpch: see bug 210910, it should be done properly in the backend
@ -399,6 +400,12 @@ var BookmarksMenuController = {
doCommand: function (aCommand)
{
# we needed to focus the element that has the bm command controller
# to get here. Now, let''s focus the content before performing the command:
# if a modal dialog is called from now, the content will be focused again
# automatically after dismissing the dialog
if (content)
content.focus();
BookmarksMenuDNDObserver.onDragRemoveFeedBack(document.popupNode);
var selection = BookmarksMenu._selection;
var target = BookmarksMenu._target;
@ -602,14 +609,14 @@ var BookmarksMenuDNDObserver = {
return null;
var node = aNode;
var observer;
do {
while (node) {
for (var i=0; i < this.mObservers.length; i++) {
observer = this.mObservers[i];
if (observer == node)
return observer;
}
node = node.parentNode;
} while (node != document)
}
return null;
},