Skip to content

Commit

Permalink
1.6b.rev1
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Noitidart committed Jan 28, 2016
1 parent ddff41b commit 5fa4a24
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 18,848 deletions.
4 changes: 3 additions & 1 deletion bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -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});
}
}
];
Expand Down
1 change: 0 additions & 1 deletion chrome.manifest
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion locale/en-US/bootstrap.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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...
Expand Down
12 changes: 0 additions & 12 deletions locale/fr/bootstrap.properties

This file was deleted.

7 changes: 0 additions & 7 deletions locale/fr/inlay.properties

This file was deleted.

7 changes: 0 additions & 7 deletions locale/fr/options_inline.dtd

This file was deleted.

4 changes: 2 additions & 2 deletions modules/MainWorker/MainWorker.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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]);
Expand Down
32 changes: 1 addition & 31 deletions resources/scripts/react-dom.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);

// <script>
} else {
var g
if (typeof window !== "undefined") {
g = window;
} else if (typeof global !== "undefined") {
g = global;
} else if (typeof self !== "undefined") {
g = self;
} else {
// works providing we're not in "use strict";
// needed for Java 8 Nashorn
// see https://github.com/facebook/react/issues/3037
g = this;
}
g.ReactDOM = f(g.React);
}

})(function(React) {
return React.__SECRET_DOM_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
});
!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e(require("react"));else if("function"==typeof define&&define.amd)define(["react"],e);else{var f;f="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,f.ReactDOM=e(f.React)}}(function(e){return e.__SECRET_DOM_DO_NOT_USE_OR_YOU_WILL_BE_FIRED});
Loading

0 comments on commit 5fa4a24

Please sign in to comment.