Merge pull request #82 from mozilla/moar_maor

maor -> moar
This commit is contained in:
ckarlof 2013-10-24 14:14:13 -07:00
Родитель 3cf3cd64fb bb52c7e597
Коммит 0213e9741c
2 изменённых файлов: 6 добавлений и 6 удалений

Просмотреть файл

@ -33,7 +33,7 @@ function getQueryVariable(variable) {
return null; return null;
} }
state.maor_native = (getQueryVariable('maor_native') !== null); state.moar_native = (getQueryVariable('moar_native') !== null);
if ((state.device === 'mobile' if ((state.device === 'mobile'

Просмотреть файл

@ -99,12 +99,12 @@ setupFunctions["t1-create-signin"] = function() {
sessionToken: client.sessionToken, sessionToken: client.sessionToken,
email: email email: email
}; };
if (state.maor_native) { if (state.moar_native) {
// this uses more native natives for doing key fetch and assertion generation // this uses more native natives for doing key fetch and assertion generation
// key fetch will happen in native, so send it over // key fetch will happen in native, so send it over
payload.keyFetchToken = client.keyFetchToken; payload.keyFetchToken = client.keyFetchToken;
payload.unwrapBKey = client.unwrapBKey; payload.unwrapBKey = client.unwrapBKey;
console.log('sendToBrowser maor native payload: ', payload); console.log('sendToBrowser moar native payload: ', payload);
sendToBrowser('login', payload); sendToBrowser('login', payload);
switchTo("t2-signed-in-page"); switchTo("t2-signed-in-page");
$("#progress").hide(); // hide the sync progress for now $("#progress").hide(); // hide the sync progress for now
@ -217,7 +217,7 @@ setupFunctions["t1-create-signin"] = function() {
return client.login(); return client.login();
}) })
.done(function () { .done(function () {
if (state.maor_native) { if (state.moar_native) {
// this uses more native natives for doing key fetch and assertion generation // this uses more native natives for doing key fetch and assertion generation
// key fetch will happen in native, so send it over // key fetch will happen in native, so send it over
var payload = { var payload = {
@ -226,7 +226,7 @@ setupFunctions["t1-create-signin"] = function() {
keyFetchToken: client.keyFetchToken, keyFetchToken: client.keyFetchToken,
unwrapBKey: client.unwrapBKey unwrapBKey: client.unwrapBKey
}; };
console.log('sendToBrowser maor native payload: ', payload); console.log('sendToBrowser moar native payload: ', payload);
sendToBrowser('login', payload); sendToBrowser('login', payload);
switchTo("verify"); switchTo("verify");
leaveError(); leaveError();
@ -306,7 +306,7 @@ setupFunctions["verify"] = function() {
$('#dialog .verify-email').html(state.email); $('#dialog .verify-email').html(state.email);
console.log('state', state); console.log('state', state);
if (state.maor_native) { if (state.moar_native) {
return; // don't do any polling here, we'll let the browser drive the interaction return; // don't do any polling here, we'll let the browser drive the interaction
} }