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

Bug 301329 Can't unblock images etc. (regression) r=mconnor sr=bz a=bsmedberg

This commit is contained in:
neil%parkwaycc.co.uk 2005-07-28 13:47:59 +00:00
Родитель 0501813bf8
Коммит 020a82a179
3 изменённых файлов: 34 добавлений и 48 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -3875,6 +3875,7 @@ function nsContextMenu( xulMenu ) {
this.onTextInput = false;
this.onKeywordField = false;
this.onImage = false;
this.onLoadedImage = false;
this.onLink = false;
this.onMailtoLink = false;
this.onSaveableLink = false;
@ -3952,7 +3953,7 @@ nsContextMenu.prototype = {
this.showItem( "context-savelink", this.onSaveableLink );
// Save image depends on whether there is one.
this.showItem( "context-saveimage", this.onImage );
this.showItem( "context-saveimage", this.onLoadedImage );
this.showItem( "context-sendimage", this.onImage );
@ -3976,9 +3977,9 @@ nsContextMenu.prototype = {
if (shell)
haveSetDesktopBackground = true;
#endif
this.showItem( "context-setDesktopBackground", haveSetDesktopBackground && this.onImage );
this.showItem( "context-setDesktopBackground", haveSetDesktopBackground && this.onLoadedImage );
if ( haveSetDesktopBackground && this.onImage ) {
if ( haveSetDesktopBackground && this.onLoadedImage ) {
// Disable the Set as Desktop Background menu item if we're still trying
// to load the image or the load failed
const nsIImageLoadingContent = Components.interfaces.nsIImageLoadingContent;
@ -4099,6 +4100,7 @@ nsContextMenu.prototype = {
}
// Initialize contextual info.
this.onImage = false;
this.onLoadedImage = false;
this.onStandaloneImage = false;
this.onMetaDataItem = false;
this.onTextInput = false;
@ -4115,13 +4117,16 @@ nsContextMenu.prototype = {
// See if the user clicked on an image.
if ( this.target.nodeType == Node.ELEMENT_NODE ) {
if ( this.isImageSaveable( this.target ) ) {
if ( this.target instanceof Components.interfaces.nsIImageLoadingContent && this.target.currentURI ) {
this.onImage = true;
var request = this.target.getRequest( Components.interfaces.nsIImageLoadingContent.CURRENT_REQUEST );
if (request && (request.imageStatus & request.STATUS_SIZE_AVAILABLE))
this.onLoadedImage = true;
this.imageURL = this.target.currentURI.spec;
if ( this.target.ownerDocument instanceof ImageDocument)
this.onStandaloneImage = true;
} else if ( this.target instanceof HTMLInputElement ) {
} else if ( this.target instanceof HTMLInputElement ) {
type = this.target.getAttribute("type");
this.onTextInput = this.isTargetATextBox(this.target);
this.onKeywordField = this.isTargetAKeywordField(this.target);
@ -4256,15 +4261,6 @@ nsContextMenu.prototype = {
var url = elem.ownerDocument.defaultView.getComputedStyle( elem, '' ).getPropertyCSSValue( prop );
return ( url.primitiveType == CSSPrimitiveValue.CSS_URI ) ? url.getStringValue() : null;
},
// Returns true iff clicked on image is saveable.
isImageSaveable : function ( image ) {
if (image instanceof Components.interfaces.nsIImageLoadingContent) {
var request = image.getRequest(image.CURRENT_REQUEST);
if (request && (request.imageStatus & request.STATUS_SIZE_AVAILABLE))
return true;
}
return false;
},
// Returns true iff clicked on link is saveable.
isLinkSaveable : function ( link ) {
// We don't do the Right Thing for news/snews yet, so turn them off

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

@ -56,6 +56,7 @@ function nsContextMenu( xulMenu ) {
this.popupURL = null;
this.onTextInput = false;
this.onImage = false;
this.onLoadedImage = false;
this.onLink = false;
this.onMailtoLink = false;
this.onSaveableLink = false;
@ -132,7 +133,7 @@ nsContextMenu.prototype = {
this.showItem( "context-savelink", this.onSaveableLink );
// Save image depends on whether there is one.
this.showItem( "context-saveimage", this.onImage );
this.showItem( "context-saveimage", this.onLoadedImage );
this.showItem( "context-sendimage", this.onImage );
},
@ -146,11 +147,11 @@ nsContextMenu.prototype = {
this.showItem( "context-sep-properties", !( this.inDirList || this.isTextSelected || this.onTextInput ) );
// Set As Wallpaper depends on whether an image was clicked on, and only works on Windows.
var isWin = navigator.appVersion.indexOf("Windows") != -1;
this.showItem( "context-setWallpaper", isWin && this.onImage );
this.showItem( "context-setWallpaper", isWin && this.onLoadedImage );
this.showItem( "context-sep-image", this.onImage );
if( isWin && this.onImage )
if( isWin && this.onLoadedImage )
// Disable the Set As Wallpaper menu item if we're still trying to load the image
this.setItemAttr( "context-setWallpaper", "disabled", (("complete" in this.target) && !this.target.complete) ? "true" : null );
@ -241,6 +242,7 @@ nsContextMenu.prototype = {
}
// Initialize contextual info.
this.onImage = false;
this.onLoadedImage = false;
this.onStandaloneImage = false;
this.onMetaDataItem = false;
this.onTextInput = false;
@ -256,14 +258,16 @@ nsContextMenu.prototype = {
// See if the user clicked on an image.
if ( this.target.nodeType == Node.ELEMENT_NODE ) {
if ( this.isImageSaveable( this.target ) ) {
if ( this.target instanceof Components.interfaces.nsIImageLoadingContent && this.target.currentURI ) {
this.onImage = true;
var request = this.target.getRequest( Components.interfaces.nsIImageLoadingContent.CURRENT_REQUEST );
if (request && (request.imageStatus & request.STATUS_SIZE_AVAILABLE))
this.onLoadedImage = true;
this.imageURL = this.target.currentURI.spec;
var documentType = window._content.document.contentType;
if ( documentType.substr(0,6) == "image/" )
this.onStandaloneImage = true;
} else if ( this.target instanceof HTMLInputElement) {
if ( this.target.ownerDocument instanceof ImageDocument )
this.onStandaloneImage = true;
} else if ( this.target instanceof HTMLInputElement) {
type = this.target.getAttribute("type");
this.onTextInput = this.isTargetATextBox(this.target);
} else if ( this.target instanceof HTMLTextAreaElement ) {
@ -432,15 +436,6 @@ nsContextMenu.prototype = {
var url = elem.ownerDocument.defaultView.getComputedStyle( elem, '' ).getPropertyCSSValue( prop );
return ( url.primitiveType == CSSPrimitiveValue.CSS_URI ) ? url.getStringValue() : null;
},
// Returns true iff clicked on image is saveable.
isImageSaveable : function ( image ) {
if (image instanceof Components.interfaces.nsIImageLoadingContent) {
var request = image.getRequest(image.CURRENT_REQUEST);
if (request && (request.imageStatus & request.STATUS_SIZE_AVAILABLE))
return true;
}
return false;
},
// Returns true iff clicked on link is saveable.
isLinkSaveable : function ( link ) {
// We don't do the Right Thing for news/snews yet, so turn them off

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

@ -55,6 +55,7 @@ function nsContextMenu( xulMenu ) {
this.popupURL = null;
this.onTextInput = false;
this.onImage = false;
this.onLoadedImage = false;
this.onLink = false;
this.onMailtoLink = false;
this.onSaveableLink = false;
@ -147,7 +148,7 @@ nsContextMenu.prototype = {
this.showItem( "context-savelink", this.onSaveableLink );
// Save/Send image depends on whether there is one.
showSave = this.onImage || this.onStandaloneImage;
showSave = this.onLoadedImage || this.onStandaloneImage;
if (showSave)
goSetMenuValue( "context-saveimage", this.autoDownload ? "valueSave" : "valueSaveAs" );
this.showItem( "context-saveimage", showSave );
@ -166,11 +167,11 @@ nsContextMenu.prototype = {
this.showItem( "context-sep-properties", !( this.inDirList || this.isTextSelected || this.onTextInput ) );
// Set As Wallpaper depends on whether an image was clicked on, and only works on Windows.
var isWin = navigator.appVersion.indexOf("Windows") != -1;
this.showItem( "context-setWallpaper", isWin && (this.onImage || this.onStandaloneImage));
this.showItem( "context-setWallpaper", isWin && (this.onLoadedImage || this.onStandaloneImage));
this.showItem( "context-sep-image", this.onImage || this.onStandaloneImage);
if( isWin && this.onImage )
if( isWin && this.onLoadedImage )
// Disable the Set As Wallpaper menu item if we're still trying to load the image
this.setItemAttr( "context-setWallpaper", "disabled", (("complete" in this.target) && !this.target.complete) ? "true" : null );
@ -263,6 +264,7 @@ nsContextMenu.prototype = {
setTarget : function ( node ) {
// Initialize contextual info.
this.onImage = false;
this.onLoadedImage = false;
this.onStandaloneImage = false;
this.onMetaDataItem = false;
this.onTextInput = false;
@ -282,14 +284,16 @@ nsContextMenu.prototype = {
// See if the user clicked on an image.
if ( this.target.nodeType == Node.ELEMENT_NODE ) {
if ( this.isImageSaveable( this.target ) ) {
if ( this.target instanceof Components.interfaces.nsIImageLoadingContent && this.target.currentURI ) {
this.onImage = true;
var request = this.target.getRequest( Components.interfaces.nsIImageLoadingContent.CURRENT_REQUEST );
if (request && (request.imageStatus & request.STATUS_SIZE_AVAILABLE))
this.onLoadedImage = true;
this.imageURL = this.target.currentURI.spec;
var documentType = window.content.document.contentType;
if ( documentType.substr(0,6) == "image/" )
this.onStandaloneImage = true;
} else if ( this.target instanceof HTMLInputElement ) {
if ( this.target.ownerDocument instanceof ImageDocument )
this.onStandaloneImage = true;
} else if ( this.target instanceof HTMLInputElement ) {
type = this.target.getAttribute("type");
this.onTextInput = this.isTargetATextBox(this.target);
} else if ( this.target instanceof HTMLTextAreaElement ) {
@ -459,15 +463,6 @@ nsContextMenu.prototype = {
var url = elem.ownerDocument.defaultView.getComputedStyle( elem, '' ).getPropertyCSSValue( prop );
return ( url.primitiveType == CSSPrimitiveValue.CSS_URI ) ? url.getStringValue() : null;
},
// Returns true iff clicked on image is saveable.
isImageSaveable : function ( image ) {
if (image instanceof Components.interfaces.nsIImageLoadingContent) {
var request = image.getRequest(image.CURRENT_REQUEST);
if (request && (request.imageStatus & request.STATUS_SIZE_AVAILABLE))
return true;
}
return false;
},
// Returns true iff clicked on link is saveable.
isLinkSaveable : function ( link ) {
// We don't do the Right Thing for news/snews yet, so turn them off