github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1636 from sharelatex/ho-fail-lint

Browse source 
throw error in bash quickly on error

GitOrigin-RevId: 03df23aff25583f3af122f9a643c8faef64c5c46
This commit is contained in:
Henry Oswald 2019-03-18 15:25:10 +00:00 committed by sharelatex
parent e6e3c023ed
commit 991cbf3fee
3 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
services/web/install_deps.sh
View file

@ -1,10 +1,12 @@
#!/bin/bash #!/bin/bash
set -e
WEBPACK_ENV=production make minify & WEBPACK_ENV=production make minify &
make --no-print-directory format & make --no-print-directory format &
make --no-print-directory lint & make --no-print-directory lint &
npm install git+https://github.com/sharelatex/translations-sharelatex.git#master & npm install git+https://github.com/sharelatex/translations-sharelatex.git#master &
wait wait -n
chmod -R 0755 /app/public chmod -R 0755 /app/public
chown -R node:node /app/public chown -R node:node /app/public

2
services/web/public/src/ide/editor/Document.js
View file

@ -396,7 +396,7 @@ define([
remote_doc_id: update != null ? update.doc : undefined, remote_doc_id: update != null ? update.doc : undefined,
wantToBeJoined: this.wantToBeJoined, wantToBeJoined: this.wantToBeJoined,
update, update,
hasDoc: (this.doc != null) hasDoc: this.doc != null
}) })
if ( if (

24
services/web/public/src/main/new-subscription.js
View file

@ -27,14 +27,22 @@ define(['base', 'directives/creditCards', 'libs/recurly-4.8.5'], App =>
event_tracking.sendMB('subscription-form-switch-to-student', { event_tracking.sendMB('subscription-form-switch-to-student', {
plan: window.plan_code plan: window.plan_code
}) })
event_tracking.send('subscription-funnel', 'subscription-form-switch-to-student', window.plan_code) event_tracking.send(
'subscription-funnel',
'subscription-form-switch-to-student',
window.plan_code
)
window.location = `/user/subscription/new?planCode=${planCode}&currency=${ window.location = `/user/subscription/new?planCode=${planCode}&currency=${
$scope.currencyCode $scope.currencyCode
}&cc=${$scope.data.coupon}` }&cc=${$scope.data.coupon}`
} }
event_tracking.sendMB('subscription-form', { plan: window.plan_code }) event_tracking.sendMB('subscription-form', { plan: window.plan_code })
event_tracking.send('subscription-funnel', 'subscription-form-viewed', window.plan_code) event_tracking.send(
'subscription-funnel',
'subscription-form-viewed',
window.plan_code
)
$scope.paymentMethod = { value: 'credit_card' } $scope.paymentMethod = { value: 'credit_card' }
@ -203,13 +211,21 @@ define(['base', 'directives/creditCards', 'libs/recurly-4.8.5'], App =>
coupon_code: postData.subscriptionDetails.coupon_code, coupon_code: postData.subscriptionDetails.coupon_code,
isPaypal: postData.subscriptionDetails.isPaypal isPaypal: postData.subscriptionDetails.isPaypal
}) })
event_tracking.send('subscription-funnel', 'subscription-form-submitted', postData.subscriptionDetails.plan_code) event_tracking.send(
'subscription-funnel',
'subscription-form-submitted',
postData.subscriptionDetails.plan_code
)
return $http return $http
.post('/user/subscription/create', postData) .post('/user/subscription/create', postData)
.then(function() { .then(function() {
event_tracking.sendMB('subscription-submission-success') event_tracking.sendMB('subscription-submission-success')
event_tracking.send('subscription-funnel', 'subscription-submission-success', postData.subscriptionDetails.plan_code) event_tracking.send(
'subscription-funnel',
'subscription-submission-success',
postData.subscriptionDetails.plan_code
)
window.location.href = '/user/subscription/thank-you' window.location.href = '/user/subscription/thank-you'
}) })
.catch(function() { .catch(function() {