From 5fa4a245880c6ffbe5757264cd0c9441b15a5ee1 Mon Sep 17 00:00:00 2001 From: Noitidart Date: Thu, 28 Jan 2016 06:37:15 -0800 Subject: [PATCH] 1.6b.rev1 * Increase check count to 2 minutes (12 checks) * No longer alerting failed json, opening in new tab * Using production version of react * Removed French locale as everything changed so much, need to add it back request --- bootstrap.js | 4 +- chrome.manifest | 1 - locale/en-US/bootstrap.properties | 2 +- locale/fr/bootstrap.properties | 12 - locale/fr/inlay.properties | 7 - locale/fr/options_inline.dtd | 7 - modules/MainWorker/MainWorker.js | 4 +- resources/scripts/react-dom.js | 32 +- resources/scripts/react.js | 18792 +--------------------------- 9 files changed, 13 insertions(+), 18848 deletions(-) delete mode 100644 locale/fr/bootstrap.properties delete mode 100644 locale/fr/inlay.properties delete mode 100644 locale/fr/options_inline.dtd diff --git a/bootstrap.js b/bootstrap.js index 6f42d18..ac6a2cc 100644 --- a/bootstrap.js +++ b/bootstrap.js @@ -183,7 +183,9 @@ var MainWorkerMainThreadFuncs = { { bTxt: justFormatStringFromName(gL10N.bootstrap['show-failed-json']), bClick: function(doClose, aBrowser) { - Services.prompt.alert(Services.wm.getMostRecentWindow('navigator:browser'), justFormatStringFromName(gL10N.bootstrap['addon_name']), BEAUTIFY().js(JSON.stringify(aExtName))); + var jsonObj = aXpiId; + // Services.prompt.alert(Services.wm.getMostRecentWindow('navigator:browser'), justFormatStringFromName(gL10N.bootstrap['addon_name']), BEAUTIFY().js(JSON.stringify(aExtName))); + aBrowser.ownerDocument.defaultView.gBrowser.loadOneTab('data:text/plain,' + BEAUTIFY().js(JSON.stringify(jsonObj)).replace(/\n/g, '%0A'), {inBackground:false, relatedToCurrent:true}); } } ]; diff --git a/chrome.manifest b/chrome.manifest index 1a4565d..060540c 100644 --- a/chrome.manifest +++ b/chrome.manifest @@ -1,4 +1,3 @@ content chrome-store-foxified ./ locale chrome-store-foxified en-US locale/en-US/ -locale chrome-store-foxified fr locale/fr/ content chrome-store-foxified-content-accessible ./resources/content-accessible/ contentaccessible=true diff --git a/locale/en-US/bootstrap.properties b/locale/en-US/bootstrap.properties index 325faa7..5546727 100644 --- a/locale/en-US/bootstrap.properties +++ b/locale/en-US/bootstrap.properties @@ -14,7 +14,7 @@ addon-install-failed-signatures=Add-on faild to install, because it is unsigned, attn-downloading=Downloading "%S" from Google Chrome Webstore... attn-downloaded-converting=Converting %S's download into Firefox extension... attn-signing=Signing "%S"... -attn-signing-submitting=Signing "%S"... Uploading... +attn-signing-submitting=Signing "%S"... Submitting request to addons.mozilla.org (AMO)... attn-signing-checking=Signing "%S"... Checking if upload has been signed... attn-signing-check-waiting=Signing "%S"... Not yet signed, will check again in %S seconds... attn-signing-downloading=Signing "%S"... Upload was signed. Downloading signed version... diff --git a/locale/fr/bootstrap.properties b/locale/fr/bootstrap.properties deleted file mode 100644 index 30511ae..0000000 --- a/locale/fr/bootstrap.properties +++ /dev/null @@ -1,12 +0,0 @@ -addon_name=Chrome-Store-Foxified -addon_description=Active les mouvements de souris définis par l’utilisateur pour lancer les fonctions personnalisées - -addon-installed-userdisabled=L’extension a été installée avec succès, mais vous l’avez désactivée, veuillez l’activer à partir du gestionnaire de modules complémentaires. -addon-installed-appdisabled=l’extension n’a pas pu être installée parce qu’elle n’est pas compatible avec cette version de Firefox. -addon-installed=Installation réussie de l’extension. -addon-install-failed=Échec de l’installation de l’extension, erreur de type : - -xpi-filename-template=%S - Version %S - Foxified - -request-pref-toggle=In order to install unsigned add-ons, the "xpi.signatures.required" preference needs to be set to "false", would you like to allow this? -addon-install-failed-signatures=Add-on faild to install, because it is unsigned, and your preferences disallow installation of unsigned add-ons. \ No newline at end of file diff --git a/locale/fr/inlay.properties b/locale/fr/inlay.properties deleted file mode 100644 index cc09a41..0000000 --- a/locale/fr/inlay.properties +++ /dev/null @@ -1,7 +0,0 @@ -add_to_firefox=Ajouter à Firefox -starting=Téléchargement en cours - -failed_isntall=Failed to download and install extension, please report to addon author. Here is the error, see browser console for more readable version: - -error1=ERROR: Could not find extension id, will not try to install from href -error2=ERROR: Could not find extension id, will not try to install \ No newline at end of file diff --git a/locale/fr/options_inline.dtd b/locale/fr/options_inline.dtd deleted file mode 100644 index fbcd578..0000000 --- a/locale/fr/options_inline.dtd +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/modules/MainWorker/MainWorker.js b/modules/MainWorker/MainWorker.js index d813c18..e1b4543 100644 --- a/modules/MainWorker/MainWorker.js +++ b/modules/MainWorker/MainWorker.js @@ -266,7 +266,7 @@ function jpmSign(aPathOrBlobToXpi, aAddonVersionInXpi, aAddonIdInXpi, aPlatofrmP } cumulativeCheckCount++; - if (cumulativeCheckCount > 5) { + if (cumulativeCheckCount >= 12) { // throw new Error('not getting signed, probably not passing review'); throw { msg: 'signing-failed: dev enforced timeout', @@ -516,7 +516,7 @@ function doit(aExtId, aExtName, aPrefs, aAttnBarInstState) { aAttnBarInstState.aHideClose = false; if (ex.msg && ex.msg.indexOf('signing-failed') === 0) { aAttnBarInstState.aTxt = formatStringFromName('attn-failed-signing', 'bootstrap', [aExtName]); - self.postMessage(['updateAttnBar', aAttnBarInstState, 'attn-failed-signing', ex]); + self.postMessage(['updateAttnBar', aAttnBarInstState, 'attn-failed-signing', aExtName, ex]); } else { aAttnBarInstState.aTxt = formatStringFromName('attn-something-went-wrong', 'bootstrap', [aExtName]); self.postMessage(['updateAttnBar', aAttnBarInstState]); diff --git a/resources/scripts/react-dom.js b/resources/scripts/react-dom.js index 38e63aa..d1ee9f3 100644 --- a/resources/scripts/react-dom.js +++ b/resources/scripts/react-dom.js @@ -9,34 +9,4 @@ * of patent rights can be found in the PATENTS file in the same directory. * */ -// Based off https://github.com/ForbesLindesay/umd/blob/master/template.js -;(function(f) { - // CommonJS - if (typeof exports === "object" && typeof module !== "undefined") { - module.exports = f(require('react')); - - // RequireJS - } else if (typeof define === "function" && define.amd) { - define(['react'], f); - - //