Merge pull request #1310 from mozilla/updates

added promo string to ftl & updated deps
This commit is contained in:
Danny Coates 2019-04-26 11:49:10 -07:00 committed by GitHub
commit a4e8c0b4a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 1500 additions and 1386 deletions

View File

@ -448,7 +448,7 @@ module.exports.empty = function(state, emit) {
</div> </div>
<input <input
id="file-upload" id="file-upload"
class="opacity-0 w-0 h-0 appearance-none absolute" class="opacity-0 w-0 h-0 appearance-none absolute overflow-hidden"
type="file" type="file"
multiple multiple
onfocus="${focus}" onfocus="${focus}"

View File

@ -10,7 +10,6 @@ function banner(state) {
const show = const show =
!state.capabilities.standalone && !state.capabilities.standalone &&
!/firefox/i.test(navigator.userAgent) && !/firefox/i.test(navigator.userAgent) &&
document.querySelector('html').lang.startsWith('en') &&
!state.route.startsWith('/unsupported/'); !state.route.startsWith('/unsupported/');
if (show) { if (show) {
return state.cache(Promo, 'promo').render(); return state.cache(Promo, 'promo').render();

View File

@ -3,8 +3,9 @@ const Component = require('choo/component');
const assets = require('../../common/assets'); const assets = require('../../common/assets');
class Promo extends Component { class Promo extends Component {
constructor(name) { constructor(name, state) {
super(name); super(name);
this.state = state;
} }
update() { update() {
@ -22,13 +23,12 @@ class Promo extends Component {
class="w-6" class="w-6"
alt="Firefox" alt="Firefox"
/> />
<span class="ml-3" <span class="ml-3">
>Send is brought to you by the all-new Firefox.${' '} ${this.state.translate('downloadFirefoxPromo')}${' '}
<a <a
class="text-blue" class="text-blue"
href="https://www.mozilla.org/firefox/new/?utm_campaign=send-acquisition&utm_medium=referral&utm_source=send.firefox.com" href="https://www.mozilla.org/firefox/new/?utm_campaign=send-acquisition&utm_medium=referral&utm_source=send.firefox.com"
> >${this.state.translate('downloadFirefox')}</a
Download Firefox now </a
> >
</span> </span>
</div> </div>

2842
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -65,15 +65,14 @@
"@babel/plugin-syntax-dynamic-import": "^7.2.0", "@babel/plugin-syntax-dynamic-import": "^7.2.0",
"@babel/preset-env": "^7.4.3", "@babel/preset-env": "^7.4.3",
"@dannycoates/webcrypto-liner": "^0.1.37", "@dannycoates/webcrypto-liner": "^0.1.37",
"@dannycoates/webpack-dev-server": "^3.1.4", "@fullhuman/postcss-purgecss": "^1.2.0",
"@fullhuman/postcss-purgecss": "^1.1.0",
"@mattiasbuelens/web-streams-polyfill": "0.2.1", "@mattiasbuelens/web-streams-polyfill": "0.2.1",
"asmcrypto.js": "^0.22.0", "asmcrypto.js": "^0.22.0",
"babel-loader": "^8.0.5", "babel-loader": "^8.0.5",
"babel-plugin-istanbul": "^5.1.2", "babel-plugin-istanbul": "^5.1.3",
"base64-js": "^1.3.0", "base64-js": "^1.3.0",
"content-disposition": "^0.5.3", "content-disposition": "^0.5.3",
"copy-webpack-plugin": "^5.0.2", "copy-webpack-plugin": "^5.0.3",
"core-js": "^3.0.1", "core-js": "^3.0.1",
"crc": "^3.8.0", "crc": "^3.8.0",
"cross-env": "^5.2.0", "cross-env": "^5.2.0",
@ -93,12 +92,12 @@
"git-rev-sync": "^1.12.0", "git-rev-sync": "^1.12.0",
"html-loader": "^0.5.5", "html-loader": "^0.5.5",
"http_ece": "^1.1.0", "http_ece": "^1.1.0",
"husky": "^1.3.1", "husky": "^2.1.0",
"lint-staged": "^8.1.5", "lint-staged": "^8.1.5",
"mocha": "^6.1.3", "mocha": "^6.1.4",
"morgan": "^1.9.1", "morgan": "^1.9.1",
"nanobus": "^4.4.0", "nanobus": "^4.4.0",
"nanohtml": "^1.5.0", "nanohtml": "^1.6.0",
"nanotiming": "^7.3.1", "nanotiming": "^7.3.1",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"nyc": "^14.0.0", "nyc": "^14.0.0",
@ -106,7 +105,7 @@
"postcss-preset-env": "^6.6.0", "postcss-preset-env": "^6.6.0",
"prettier": "^1.17.0", "prettier": "^1.17.0",
"proxyquire": "^2.1.0", "proxyquire": "^2.1.0",
"puppeteer": "1.11.0", "puppeteer": "^1.15.0",
"raven-js": "^3.27.0", "raven-js": "^3.27.0",
"raw-loader": "^2.0.0", "raw-loader": "^2.0.0",
"redis-mock": "^0.43.0", "redis-mock": "^0.43.0",
@ -129,18 +128,19 @@
"wdio-selenium-standalone-service": "0.0.12", "wdio-selenium-standalone-service": "0.0.12",
"wdio-spec-reporter": "^0.1.5", "wdio-spec-reporter": "^0.1.5",
"webdriverio": "^4.14.4", "webdriverio": "^4.14.4",
"webpack": "4.28.4", "webpack": "^4.30.0",
"webpack-cli": "^3.3.0", "webpack-cli": "^3.3.1",
"webpack-dev-middleware": "^3.6.2", "webpack-dev-middleware": "^3.6.2",
"webpack-dev-server": "^3.3.1",
"webpack-manifest-plugin": "^2.0.4", "webpack-manifest-plugin": "^2.0.4",
"webpack-unassert-loader": "^1.2.0" "webpack-unassert-loader": "^1.2.0"
}, },
"dependencies": { "dependencies": {
"@google-cloud/storage": "^2.5.0", "@google-cloud/storage": "^2.5.0",
"aws-sdk": "^2.438.0", "aws-sdk": "^2.443.0",
"body-parser": "^1.18.3", "body-parser": "^1.19.0",
"choo": "^6.13.3", "choo": "^6.13.3",
"cldr-core": "^35.0.0", "cldr-core": "^35.1.0",
"convict": "^4.4.1", "convict": "^4.4.1",
"express": "^4.16.3", "express": "^4.16.3",
"express-ws": "github:dannycoates/express-ws", "express-ws": "github:dannycoates/express-ws",
@ -150,12 +150,12 @@
"helmet": "^3.16.0", "helmet": "^3.16.0",
"mkdirp": "^0.5.1", "mkdirp": "^0.5.1",
"mozlog": "^2.2.0", "mozlog": "^2.2.0",
"node-fetch": "^2.3.0", "node-fetch": "^2.4.0",
"raven": "^2.6.4", "raven": "^2.6.4",
"redis": "^2.8.0", "redis": "^2.8.0",
"selenium-standalone": "^6.15.6", "selenium-standalone": "^6.15.6",
"ua-parser-js": "^0.7.19", "ua-parser-js": "^0.7.19",
"websocket-stream": "^5.4.0" "websocket-stream": "^5.5.0"
}, },
"availableLanguages": [ "availableLanguages": [
"en-US", "en-US",

View File

@ -137,3 +137,4 @@ noStreamsWarning = This browser might not be able to decrypt a file this big.
noStreamsOptionCopy = Copy the link to open in another browser noStreamsOptionCopy = Copy the link to open in another browser
noStreamsOptionFirefox = Try our favorite browser noStreamsOptionFirefox = Try our favorite browser
noStreamsOptionDownload = Continue with this browser noStreamsOptionDownload = Continue with this browser
downloadFirefoxPromo = { -send-short-brand } is brought to you by the all-new { -firefox }.