Merge branch 'fix/commit-directory' of https://github.com/freecodecamp/freecodecamp into fix/commit-directory

Conflicts:
	server/views/commit/index.jade
This commit is contained in:
Quincy Larson
2015-12-10 00:02:22 -06:00
3 changed files with 15 additions and 5 deletions

View File

@@ -106,10 +106,9 @@ export default function commit(app) {
Object.assign(
{
title: 'Commit to a nonprofit. Commit to your goal.',
pledge,
frontEndCert: commitGoals.frontEndCert,
fullStackCert: commitGoals.fullStackCert
pledge
},
commitGoals,
nonprofit
)
);

View File

@@ -1,4 +1,6 @@
{
"frontEndCert": "Front End Development Certification",
"backEndCert": "Back End Development Certification",
"dataVisCert": "Data Visualisation Certification",
"fullStackCert": "Full Stack Development Certification"
}

View File

@@ -28,10 +28,10 @@ block content
input(type='radio' id=frontEndCert value=frontEndCert name='goal' checked="checked")
| Front End Cert
label.btn.btn-primary.btn-lg
input(type='radio' id=fullStackCert value=dataVisCert name='goal')
input(type='radio' id=dataVisCert value=dataVisCert name='goal')
| Data Viz Cert
label.btn.btn-primary.btn-lg
input(type='radio' id=fullStackCert value=backEndCert name='goal')
input(type='radio' id=backEndCert value=backEndCert name='goal')
| Back End Cert
label.btn.btn-primary.btn-lg
input(type='radio' id=fullStackCert value=fullStackCert name='goal')
@@ -91,6 +91,15 @@ block content
});
$('#commit-btn-submit').click(function() {
if (
history &&
typeof history.pushState === 'function'
) {
history.pushState(history.state, null, '/commit/pledge?' + $('form').serialize());
return null;
}
window.location.href = '/commit/pledge?' + $('form').serialize();
});
});