Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

remove ftuStarting if FTU is skipped for any reason #6770

Merged
merged 1 commit into from

2 participants

@mykmelez
Collaborator

There are four conditions under which the FTU is skipped, but the ftuStarting class is only removed from the screen for one of them, which causes visual (and behavioral?) glitches when the FTU is skipped for one of the other reasons.

(I found this because Firefox OS Simulator unsets ftu.manifestURL in order to skip the FTU when B2G is run in the Simulator, which causes those glitches to appear, since ftuStarting never gets removed in that case.)

ftuStarting should be removed from the screen if the FTU is skipped for any reason. Here's a patch that does that.

@mykmelez
Collaborator

I filed bug 817259 on this issue.

@etiennesegonzac can you review this? It looks like you made related changes in that area of the codebase recently.

@mykmelez
Collaborator

This change just got approval-gaia-master in bug 817259, but I don't have commit privileges to the Gaia repository. Could someone merge this pull on my behalf?

@etiennesegonzac etiennesegonzac merged commit b0e1277 into mozilla-b2g:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Dec 1, 2012
  1. @mykmelez
This page is out of date. Refresh to see the latest.
Showing with 2 additions and 1 deletion.
  1. +2 −1  apps/system/js/window_manager.js
View
3  apps/system/js/window_manager.js
@@ -767,6 +767,7 @@ var WindowManager = (function() {
}
function skipFTU() {
+ document.getElementById('screen').classList.remove('ftuStarting');
handleInitlogo();
setDisplayedApp(homescreen);
// Eventually ask for SIM code, but only when we do not show FTU,
@@ -779,11 +780,11 @@ var WindowManager = (function() {
// reference to the app and launch it.
function retrieveFTU() {
window.asyncStorage.getItem('ftu.enabled', function getItem(launchFTU) {
+ document.getElementById('screen').classList.add('ftuStarting');
if (launchFTU === false) {
skipFTU();
return;
}
- document.getElementById('screen').classList.add('ftuStarting');
var lock = navigator.mozSettings.createLock();
var req = lock.get('ftu.manifestURL');
req.onsuccess = function() {
Something went wrong with that request. Please try again.