Bug 810153 - Better login system for calendar #6869

Merged
merged 1 commit into from Dec 7, 2012

Projects

None yet

2 participants

@lightsofapollo
Contributor

We now block the user until authentication and initial calendars have been found.
( this is different from event sync which takes up 90%+ of the actual sync time which still does not block the user ).

The UI is not beautiful but we can iterate over that later on.
Unfortunately I think we need this one additional string.

@lightsofapollo lightsofapollo commented on the diff Dec 7, 2012
apps/calendar/index.html
@@ -20,6 +20,7 @@
<link rel="stylesheet" type="text/css" href="/shared/style/confirm.css" />
<link rel="stylesheet" type="text/css" href="/shared/style/switches.css" />
<link rel="stylesheet" type="text/css" href="/shared/style/status.css" />
+ <link rel="stylesheet" type="text/css" href="/shared/style_unstable/progress_activity.css" />
@lightsofapollo
lightsofapollo Dec 7, 2012 Contributor

Ideally I would love to async load this

@lightsofapollo lightsofapollo commented on the diff Dec 7, 2012
apps/calendar/index.html
@@ -369,13 +376,11 @@ <h1 data-l10n-id="account-header">Account</h1>
</ol>
</fieldset>
</form>
-
- <section role="status">
@lightsofapollo
lightsofapollo Dec 7, 2012 Contributor

tab fixes

@lightsofapollo lightsofapollo commented on the diff Dec 7, 2012
apps/calendar/js/controllers/sync.js
@@ -10,116 +10,102 @@ Calendar.ns('Controllers').Sync = (function() {
*/
function Sync(app) {
@lightsofapollo
lightsofapollo Dec 7, 2012 Contributor

Probably makes more sense to just look at the new file rather then this diff...

@KevinGrandon KevinGrandon and 1 other commented on an outdated diff Dec 7, 2012
apps/calendar/test/unit/utils/account_creation_test.js
+ events[type] = data;
+ }
+ };
+
+ setup(function() {
+ events = {};
+ syncCall = null;
+ verifyCall = null;
+ calendarSyncCalls.length = 0;
+
+ model = new Calendar.Models.Account(
+ Factory('account')
+ );
+
+
+ subject.on('authorize error', handler);
@KevinGrandon
KevinGrandon Dec 7, 2012 Member

Just noticed that we're fairly inconsistent with responder event names across the calendar app - we may want to standardize. Unless there is some meaning to the difference.

E.g., 'syncFrequencyChange', 'selectedDayChange, 'missing events', 'recurring end'

@lightsofapollo
lightsofapollo Dec 7, 2012 Contributor

Nice catch, my yui days and node days are conflicting =/ I go with whatever I have used so far.

@KevinGrandon KevinGrandon commented on the diff Dec 7, 2012
apps/calendar/index.html
@@ -350,6 +351,12 @@ <h1 data-l10n-id="add-event-header">
<h1 data-l10n-id="account-header">Account</h1>
</header>
+
+ <section class="during-progress">
+ <p data-l10n-id="modify-account-setting-up">SeTtiNg uP ACcOunt</p>
@KevinGrandon
KevinGrandon Dec 7, 2012 Member

Placeholder text until we get translations?
Edit - Just saw the properties file :)

@KevinGrandon KevinGrandon and 1 other commented on an outdated diff Dec 7, 2012
apps/calendar/js/app.js
@@ -24,6 +24,12 @@ Calendar.App = (function(window) {
CreateAccount: [
{type: 'Templates', name: 'Account'}
],
+ ModifyAccount: [
+ {type: 'Utils', name: 'AccountCreation'},
+ {type: 'Store', name: 'Account'},
@KevinGrandon
KevinGrandon Dec 7, 2012 Member

We're still loading Account/Calendar.load up front so it's not needed at this point - but shouldn't hurt anything either :) Might be good to keep as a placeholder when I update that branch upstream.

@lightsofapollo
lightsofapollo Dec 7, 2012 Contributor

I will remove it for now and just leave AccountCreation so we can do all those changes at once I guess.

@KevinGrandon
Member

Makes sense to me, I should have some more time to try it out a bit later, but r=me.

@lightsofapollo lightsofapollo Bug 810153 - Account creation now blocks until calendar sync.
General bug fixes, improvements to the sync controller.
b664b4c
@lightsofapollo
Contributor

Axel reviewed the l10n changes and gave r+ on BZ.

@lightsofapollo lightsofapollo merged commit 8ca3aa6 into mozilla-b2g:master Dec 7, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment