Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixing bug 137141 - Wrong context menu items in stand alone mail window. r=neil sr=sspitzer a=drivers

Browse Source
This commit is contained in:
ssu%netscape.com 2002-06-06 02:27:20 +00:00
parent bda9c43d38
commit 9591a2fc41
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mailnews/base/resources/content/mailContextMenus.js
View File

@ -443,8 +443,19 @@ function ShowSeparator(aSeparatorID)
{ {
var separator = document.getElementById(aSeparatorID); var separator = document.getElementById(aSeparatorID);
var sibling = separator.previousSibling; var sibling = separator.previousSibling;
var siblingID;
var siblingNextHiddenAttrib = separator.nextSibling.getAttribute("hidden");
while (sibling && sibling.localName != "menuseparator") { while (sibling && sibling.localName != "menuseparator") {
if (sibling.getAttribute("hidden") != "true") siblingID = sibling.getAttribute("id");
// for some reason, context-blockimage and context-unblockimage is not
// hidden on the very first time the context menu is invoked. It's only
// hidden on subsequent triggers of the context menu. Since we're not
// using these two menuitems in mailnews, we can ignore it if encountered.
if ((sibling.getAttribute("hidden") != "true") &&
(siblingNextHiddenAttrib != "true") &&
(siblingID != "context-blockimage") &&
(siblingID != "context-unblockimage"))
return true; return true;
sibling = sibling.previousSibling; sibling = sibling.previousSibling;
} }

24
xpfe/communicator/resources/content/nsContextMenu.js
View File

@ -129,17 +129,9 @@ nsContextMenu.prototype = {
this.showItem( "context-sep-image", this.onImage ); this.showItem( "context-sep-image", this.onImage );
if( isWin && this.onImage ) { if( isWin && this.onImage )
var wallpaperItem = document.getElementById("context-setWallpaper");
// Disable the Set As Wallpaper menu item if we're still trying to load the image // Disable the Set As Wallpaper menu item if we're still trying to load the image
if (wallpaperItem) { this.setItemAttr( "context-setWallpaper", "disabled", (("complete" in this.target) && !this.target.complete) ? "true" : null );
if( !("complete" in this.target) || this.target.complete ) {
wallpaperItem.removeAttribute("disabled");
} else {
wallpaperItem.setAttribute("disabled", "true");
}
}
}
// View Image depends on whether an image was clicked on. // View Image depends on whether an image was clicked on.
this.showItem( "context-viewimage", this.onImage ); this.showItem( "context-viewimage", this.onImage );
@ -147,14 +139,7 @@ nsContextMenu.prototype = {
// View background image depends on whether there is one. // View background image depends on whether there is one.
this.showItem( "context-viewbgimage", !( this.inDirList || this.onImage || this.isTextSelected || this.onLink || this.onTextInput ) ); this.showItem( "context-viewbgimage", !( this.inDirList || this.onImage || this.isTextSelected || this.onLink || this.onTextInput ) );
this.showItem( "context-sep-viewbgimage", !( this.inDirList || this.onImage || this.isTextSelected || this.onLink || this.onTextInput ) ); this.showItem( "context-sep-viewbgimage", !( this.inDirList || this.onImage || this.isTextSelected || this.onLink || this.onTextInput ) );
var menuitem = document.getElementById("context-viewbgimage"); this.setItemAttr( "context-viewbgimage", "disabled", this.hasBGImage ? null : "true");
if ( menuitem ) {
if ( this.hasBGImage )
menuitem.removeAttribute("disabled");
else
menuitem.setAttribute("disabled", "true");
}
}, },
initMiscItems : function () { initMiscItems : function () {
// Use "Bookmark This Link" if on a link. // Use "Bookmark This Link" if on a link.
@ -690,7 +675,6 @@ nsContextMenu.prototype = {
isTextSelection : function() { isTextSelection : function() {
var result = false; var result = false;
var selection = this.searchSelected(); var selection = this.searchSelected();
var searchSelect = document.getElementById('context-searchselect');
var bundle = srGetStrBundle("chrome://communicator/locale/contentAreaCommands.properties"); var bundle = srGetStrBundle("chrome://communicator/locale/contentAreaCommands.properties");
@ -704,7 +688,7 @@ nsContextMenu.prototype = {
// format "Search for <selection>" string to show in menu // format "Search for <selection>" string to show in menu
searchSelectText = bundle.formatStringFromName("searchText", searchSelectText = bundle.formatStringFromName("searchText",
[searchSelectText], 1); [searchSelectText], 1);
searchSelect.setAttribute("label", searchSelectText); this.setItemAttr("context-searchselect", "label", searchSelectText);
} }
return result; return result;
}, },