From 4aa7eec6a5cb06e79fd8fbf2dcc7f7753af2b6eb Mon Sep 17 00:00:00 2001 From: "mozilla.mano%sent.com" Date: Thu, 12 Apr 2007 01:18:39 +0000 Subject: [PATCH] Bug 344660 - Show frame count for animated GIFs in Image Properties. patch by Florian Queze , r=me. git-svn-id: svn://10.0.0.236/trunk@224426 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/browser/base/content/metaData.js | 19 +++++++++++++++---- .../en-US/chrome/browser/metaData.properties | 2 ++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/mozilla/browser/base/content/metaData.js b/mozilla/browser/base/content/metaData.js index 3195fdfe5f7..a3100575a3d 100644 --- a/mozilla/browser/base/content/metaData.js +++ b/mozilla/browser/base/content/metaData.js @@ -260,10 +260,21 @@ function checkForImage(elem, htmllocalname) var imageRequest = img.QueryInterface(nsIImageLoadingContent) .getRequest(nsIImageLoadingContent.CURRENT_REQUEST); - if (imageRequest) - setInfo("image-type", imageRequest.mimeType); - else - setInfo("image-type", ""); + var imageType = ""; + if (imageRequest) { + imageType = imageRequest.mimeType; + var imageMimeType = /^image\/(.*)/.exec(imageType); + if (imageMimeType) { + imageType = imageMimeType[1].toUpperCase(); + var frameCount = imageRequest.image.numFrames; + if (frameCount > 1) + imageType = gMetadataBundle.getFormattedString("animatedImageType", + [imageType, frameCount]); + else + imageType = gMetadataBundle.getFormattedString("imageType", [imageType]); + } + } + setInfo("image-type", imageType); var imageSize = ""; if (img.width) { diff --git a/mozilla/browser/locales/en-US/chrome/browser/metaData.properties b/mozilla/browser/locales/en-US/chrome/browser/metaData.properties index cd66cdf5df5..75aef837e69 100644 --- a/mozilla/browser/locales/en-US/chrome/browser/metaData.properties +++ b/mozilla/browser/locales/en-US/chrome/browser/metaData.properties @@ -9,6 +9,8 @@ altTextMissing=Missing altTextBlank=Blank imageSize=%S KB (%S bytes) imageSizeUnknown=Unknown (not cached) +imageType=%S image +animatedImageType=%S image (animated, %S frames) imageDimensions=%Spx \u00D7 %Spx imageDimensionsScaled=%Spx \u00D7 %Spx (scaled to %Spx \u00D7 %Spx) # LOCALIZATION NOTE: Next two strings are for language name representations