From 513c72aabbc7066aab62f859a94904547c1a5132 Mon Sep 17 00:00:00 2001 From: Michael Ryan Date: Thu, 11 Jun 2009 21:52:39 -0400 Subject: [PATCH] 1.4.1 code --- CHANGELOG | 7 +++++-- chrome.manifest | 36 ++++++++++++++++++------------------ content/overlay.js | 48 +++++++++++++++++++++++++----------------------- install.rdf | 15 +++------------ 4 files changed, 51 insertions(+), 55 deletions(-) rewrite chrome.manifest (84%) diff --git a/CHANGELOG b/CHANGELOG index 9b5a421..dbe90f0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,8 @@ +1.4.2 (????-??-??): + +1.4.1 (2009-06-11): +* Fixed issue that caused incorrect language to be used for some locales. + 1.4.0 (2009-01-14): * The default maximum number of images per page to replace has been increased from 30 to 50. @@ -7,8 +12,6 @@ * Popup windows no longer show whitespace below the image. * For GameFAQs users: images in signatures on the GameFAQs message boards are now no longer displayed. This behavior can be changed in the options window. -* An issue that caused popups to be invisible for some Firefox 3 users should - be resolved. * Right-clicking an image will no longer trigger an error if there is nothing after the TTI menu items. * Firefox 1.0 and SeaMonkey 1.x are no longer supported. diff --git a/chrome.manifest b/chrome.manifest dissimilarity index 84% index d2bac9c..f2913d0 100644 --- a/chrome.manifest +++ b/chrome.manifest @@ -1,18 +1,18 @@ -content txttoimage jar:chrome/txttoimage.jar!/content/ -skin txttoimage classic/1.0 jar:chrome/txttoimage.jar!/skin/classic/ -overlay chrome://browser/content/browser.xul chrome://txttoimage/content/overlay.xul -overlay chrome://navigator/content/navigator.xul chrome://txttoimage/content/overlay.xul - -locale txttoimage da-DK jar:chrome/txttoimage.jar!/locale/ca-AD/ -locale txttoimage da-DK jar:chrome/txttoimage.jar!/locale/cs-CZ/ -locale txttoimage da-DK jar:chrome/txttoimage.jar!/locale/da-DK/ -locale txttoimage de-DE jar:chrome/txttoimage.jar!/locale/de-DE/ -locale txttoimage en-US jar:chrome/txttoimage.jar!/locale/en-US/ -locale txttoimage es-ES jar:chrome/txttoimage.jar!/locale/es-AR/ -locale txttoimage es-ES jar:chrome/txttoimage.jar!/locale/es-ES/ -locale txttoimage fr-FR jar:chrome/txttoimage.jar!/locale/fr-FR/ -locale txttoimage hr-HR jar:chrome/txttoimage.jar!/locale/hr-HR/ -locale txttoimage it-IT jar:chrome/txttoimage.jar!/locale/it-IT/ -locale txttoimage pt-BR jar:chrome/txttoimage.jar!/locale/pt-BR/ -locale txttoimage es-ES jar:chrome/txttoimage.jar!/locale/ro-RO/ -locale txttoimage zh-TW jar:chrome/txttoimage.jar!/locale/zh-TW/ +content txttoimage content/ +skin txttoimage classic/1.0 skin/classic/ +overlay chrome://browser/content/browser.xul chrome://txttoimage/content/overlay.xul +overlay chrome://navigator/content/navigator.xul chrome://txttoimage/content/overlay.xul + +locale txttoimage ca-AD locale/ca-AD/ +locale txttoimage cs-CZ locale/cs-CZ/ +locale txttoimage da-DK locale/da-DK/ +locale txttoimage de-DE locale/de-DE/ +locale txttoimage en-US locale/en-US/ +locale txttoimage es-AR locale/es-AR/ +locale txttoimage es-ES locale/es-ES/ +locale txttoimage fr-FR locale/fr-FR/ +locale txttoimage hr-HR locale/hr-HR/ +locale txttoimage it-IT locale/it-IT/ +locale txttoimage pt-BR locale/pt-BR/ +locale txttoimage ro-RO locale/ro-RO/ +locale txttoimage zh-TW locale/zh-TW/ diff --git a/content/overlay.js b/content/overlay.js index 36df87d..ee6297d 100644 --- a/content/overlay.js +++ b/content/overlay.js @@ -12,8 +12,8 @@ var TxttoImage = new function() var txttoimagePrefsClass = Cc['@mozilla.org/preferences-service;1'] .getService(Ci.nsIPrefService) .getBranch('txttoimage.'); - var txttoimageDisabled = new Boolean(); - var txttoimageImageLoader = new Boolean(); + var txttoimageDisabled = false; + var txttoimageImageLoader = false; var txttoimageRegular = new Array(2); var txttoimageRegularv = new Array(2); var txttoimageMouse = new Array(2); @@ -23,9 +23,9 @@ var TxttoImage = new function() var txttoimageValidDocTypes = new RegExp('^(text/html|application/xhtml\\+xml|text/xml|application/xml)$', 'i'); var txttoimagegContext = this; var txttoimageImgmode, txttoimageStrings, txttoimageImgRegExp, txttoimageImgReplaceRegExp, txttoimageImgDetectRegExp, txttoimageMaxImages, txttoimageImgsonpage, txttoimageCurrImg; - var txttoimageNoGameFAQsSig = new Boolean(); - var txttoimageNoGameFAQsSigCond = new Boolean(); - var txttoimageUndoOnDisable = new Boolean(); + var txttoimageNoGameFAQsSig = false; + var txttoimageNoGameFAQsSigCond = false; + var txttoimageUndoOnDisable = false; /** * Preference observer @@ -247,22 +247,35 @@ var TxttoImage = new function() return; } - var i = 0; // skip blacklisted sites - for (i = 0; i < txttoimageSiteBlacklist.length; i++) { + for (var i = 0; i < txttoimageSiteBlacklist.length; i++) { if (txttoimageSiteBlacklist[i].test(aDoc.URL)) { return; } } - try { + try + { var gBody = aDoc.body; - } catch(e) {} + } + catch (e) + { + return; + } - txttoimageImgsonpage = i = 0; - var anchorNodes = gBody.getElementsByTagName('a'); + txttoimageImgsonpage = 0; + + try + { + txttoimageNoGameFAQsSigCond = txttoimageNoGameFAQsSig && /(^|\.)gamefaqs\.com$/.test(aDoc.domain); + } + catch (e) + { // for safety + txttoimageNoGameFAQsSigCond = false; + } - // now, to loop through (and up to) the max amount of images + var anchorNodes = gBody.getElementsByTagName('a'); + i = 0; while (i < anchorNodes.length && txttoimageImgsonpage < txttoimageMaxImages) { // if the link matches the image regexp and isn't blacklisted... if (txttoimageImgRegExp.test(anchorNodes[i].href) && txttoimageBlacklistPass(anchorNodes[i].href)) { @@ -274,21 +287,10 @@ var TxttoImage = new function() } } - try - { - txttoimageNoGameFAQsSigCond = txttoimageNoGameFAQsSig && /(^|\.)gamefaqs\.com$/.test(aDoc.domain); - } - catch (e) - { // for safety - txttoimageNoGameFAQsSigCond = false; - } - var textNodes = txttoimageGetTextNodes(gBody); - i = 0; while (i < textNodes.length && txttoimageImgsonpage < txttoimageMaxImages) { txttoimageTxt2Img(textNodes[i]); - // end loop through textNodes i++; } diff --git a/install.rdf b/install.rdf index b3d1f91..81e6201 100644 --- a/install.rdf +++ b/install.rdf @@ -4,7 +4,7 @@ {f701c26a-479a-4724-b4f1-870db12f063c} Text-to-Image - 1.4.1pre + 1.4.2pre Convert text URLs and links to images into thumbnails. true http://www.gamefaqs.com/boards/gentopic.php?board=565885 @@ -36,7 +36,7 @@ {ec8030f7-c20a-464f-9b0e-13a3a9e97384} 1.5 - 3.1b3pre + 3.6a1pre @@ -45,16 +45,7 @@ {92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a} 2.0a1pre - 2.0a3pre - - - - - - - {a463f10c-3994-11da-9945-000d60ca027b} - 1.0 - 1.2.* + 2.0b1pre -- 2.11.4.GIT