From 5d2270e890f4e1007cc0d0e0c7d4d9227f73a8be Mon Sep 17 00:00:00 2001 From: "neil%parkwaycc.co.uk" Date: Wed, 13 Jul 2005 19:45:41 +0000 Subject: [PATCH] Don't try to save broken images b=293527 r=biesi sr=bz a=asa --- browser/base/content/browser.js | 12 ++++++++++-- mail/base/content/nsContextMenu.js | 12 ++++++++++-- .../resources/content/nsContextMenu.js | 16 ++++++++++++---- 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index b26d7bf5a854..64b98347dcc3 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -4135,8 +4135,7 @@ nsContextMenu.prototype = { // See if the user clicked on an image. if ( this.target.nodeType == Node.ELEMENT_NODE ) { - if ( this.target instanceof Components.interfaces.nsIImageLoadingContent && - this.target.currentURI != null ) { + if ( this.isImageSaveable( this.target ) ) { this.onImage = true; this.imageURL = this.target.currentURI.spec; @@ -4277,6 +4276,15 @@ 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 diff --git a/mail/base/content/nsContextMenu.js b/mail/base/content/nsContextMenu.js index 0704cfb2961b..63a8be564165 100644 --- a/mail/base/content/nsContextMenu.js +++ b/mail/base/content/nsContextMenu.js @@ -256,8 +256,7 @@ nsContextMenu.prototype = { // See if the user clicked on an image. if ( this.target.nodeType == Node.ELEMENT_NODE ) { - if ( this.target instanceof Components.interfaces.nsIImageLoadingContent && - this.target.currentURI != null ) { + if ( this.isImageSaveable( this.target ) ) { this.onImage = true; this.imageURL = this.target.currentURI.spec; @@ -433,6 +432,15 @@ 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 diff --git a/xpfe/communicator/resources/content/nsContextMenu.js b/xpfe/communicator/resources/content/nsContextMenu.js index c4cce15fdfb6..f829831c1b68 100644 --- a/xpfe/communicator/resources/content/nsContextMenu.js +++ b/xpfe/communicator/resources/content/nsContextMenu.js @@ -282,8 +282,7 @@ nsContextMenu.prototype = { // See if the user clicked on an image. if ( this.target.nodeType == Node.ELEMENT_NODE ) { - if ( this.target instanceof Components.interfaces.nsIImageLoadingContent && - this.target.currentURI != null ) { + if ( this.isImageSaveable( this.target ) ) { this.onImage = true; this.imageURL = this.target.currentURI.spec; @@ -462,6 +461,15 @@ 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 @@ -581,12 +589,12 @@ nsContextMenu.prototype = { }, // Change current window to the URL of the image. viewImage : function () { - urlSecurityCheck( this.imageURL, document ) + urlSecurityCheck( this.imageURL, document ); openTopWin( this.imageURL ); }, // Change current window to the URL of the background image. viewBGImage : function () { - urlSecurityCheck( this.bgImageURL, document ) + urlSecurityCheck( this.bgImageURL, document ); openTopWin( this.bgImageURL ); }, setWallpaper: function() {