Fix glitch on iOS when restarting Abecedarium

Author: llaske

activities/Abecedarium.activity/play.js

@@ -11,23 +11,23 @@ enyo.kind({
 	classes: "board",
 	published: {
 		context: null,
-	},	
+	},
 	components: [
 		{kind: "Signals", onEndOfSound: "endSound"},
 		{components: [
-			{name: "colorBar", classes: "colorBar"},		
+			{name: "colorBar", classes: "colorBar"},
 			{name: "home", kind: "Abcd.HomeButton"},
 			{kind: "Abcd.CaseButton"},
 			{kind: "Abcd.LanguageButton"}
 		]},
 		{components: [
 			{name: "filterLetter", kind: "Abcd.Letter", letter: "", classes: "filterLetter"},
 			{name: "filterCollection", kind: "Abcd.Collection", index: 0, classes: "filterCollection", showing: false},
-			{name: "itemCount", content: "-/-", classes: "itemCount", showing: false},		
+			{name: "itemCount", content: "-/-", classes: "itemCount", showing: false},
 			{name: "back", kind: "Image", src: "images/back.png", showing: false, classes: "standardButton backButton", ontap: "backTaped"},
 			{name: "filter", kind: "Image", src: "images/filter.png", showing: false, classes: "standardButton filterButton", ontap: "filterTaped"},
 			{name: "check", kind: "Image", src: "images/check.png", showing: false, classes: "standardButton checkButton", ontap: "checkTaped"},
-			{name: "gameFinished", kind: "Control", showing: false, classes: "gameFinished", 
+			{name: "gameFinished", kind: "Control", showing: false, classes: "gameFinished",
 				components: [
 					{
 						name: "gameFinishedMsg",
@@ -40,12 +40,12 @@ enyo.kind({
 					]}
 				]
 			}
-		]},		
+		]},
 		{name: "box", classes: "playbox", components: [
 		]},
 		{name: "filterPopup", kind: "Abcd.FilterPopup", onFilterChanged: "filterChanged"}
 	],
-	
+
 	// Constructor
 	create: function() {
 		this.inherited(arguments);
@@ -57,19 +57,19 @@ enyo.kind({
 		this.selected = null;
 		this.forbidentry = false;
 		this.filter = null;
-		
+
 		this.restoreContext();
 		this.filterChanged({filter: this.filter});
 		if (this.theme != -1)
 			this.doGame(this.themeButton);
 		else
 			this.displayButtons();
-			
+
 		if (this.gamecount === entriesByGame){
 			this.showGameFinished();
 		}
 	},
-	
+
 	// Context handling
 	restoreContext: function() {
 		if (this.context == null || this.context == "")
@@ -81,7 +81,7 @@ enyo.kind({
 		if (values[4] != "")
 			this.filter = { kind: values[4], index: values[5], letter: values[5] };
 	},
-	
+
 	saveContext: function() {
 		var values = [];
 		values.push(this.theme);
@@ -102,18 +102,18 @@ enyo.kind({
 		}
 		return values.join("|");
 	},
-	
+
 	// Delete all the box content
 	cleanBox: function() {
 		var items = [];
 		enyo.forEach(this.$.box.getControls(), function(item) {
 			items.push(item);
-		});		
+		});
 		for (var i = 0 ; i < items.length ; i++) {
 			items[i].destroy();
-		}	
+		}
 	},
-	
+
 	// Display game choice buttons
 	displayButtons: function() {
 		this.cleanBox();
@@ -123,7 +123,7 @@ enyo.kind({
 		this.$.colorBar.addClass("themeColor"+this.theme);
 		if (this.filter == null)
 			this.$.filterLetter.hide();
-		
+
 		// Draw From picture buttons
 		this.$.box.createComponent(
 			{kind: "Abcd.PlayTypeButton", from: "picture", to: "letter"+Abcd.context.casevalue, ontap: "doGame", theme: "play-button-color1"},
@@ -133,7 +133,7 @@ enyo.kind({
 			{kind: "Abcd.PlayTypeButton", from: "picture", to: "listen", ontap: "doGame", theme: "play-button-color1"},
 			{owner: this}
 		).render();
-		
+
 		// Draw From letter buttons
 		this.$.box.createComponent(
 			{kind: "Abcd.PlayTypeButton", from: "letter"+Abcd.context.casevalue, to: "picture", ontap: "doGame", theme: "play-button-color2"},
@@ -152,32 +152,32 @@ enyo.kind({
 		this.$.box.createComponent(
 			{ kind: "Abcd.PlayTypeButton", from: "listen", to: "letter"+Abcd.context.casevalue, ontap: "doGame", theme: "play-button-color3" },
 			{ owner: this }
-		).render();	
+		).render();
 	},
-	
+
 	// Localization changed
 	setLocale: function() {
 		// Remove filter because too risky
 		this.filter = null;
-		this.$.filterLetter.hide();		
-		this.$.filterCollection.hide();		
-		
+		this.$.filterLetter.hide();
+		this.$.filterCollection.hide();
+
 		// If playing, change game because could inexist in the current language
 		if (this.theme != -1)
 			this.computeGame();
-			
+
 	},
-	
+
 	// Case changed
 	setCase: function() {
 		// Redraw button
 		enyo.forEach(this.$.box.getControls(), function(item) {
 			if (item.kind == 'Abcd.Entry')
 				item.indexChanged();
 			else
-				item.setCase();				
+				item.setCase();
 		});
-		
+
 		// Redraw filter letter and filter popup
 		if (this.filter != null) {
 			if (this.filter.kind == "Abcd.Letter")
@@ -186,28 +186,28 @@ enyo.kind({
 				this.$.filterCollection.indexChanged();
 		}
 	},
-	
+
 	// Display filter dialog
 	filterTaped: function() {
 		this.$.filterPopup.display(this.filter);
 	},
-	
+
 	// Process filter change
 	filterChanged: function(s, e) {
 		this.filter = s.filter;
 		this.$.filterLetter.hide();
-		this.$.filterCollection.hide();		
+		this.$.filterCollection.hide();
 		if (this.filter != null) {
 			if (this.filter.kind == "Abcd.Letter") {
 				this.$.filterLetter.show();
 				this.$.filterLetter.setLetter(this.filter.letter);
 			} else {
 				this.$.filterCollection.show();
-				this.$.filterCollection.setIndex(this.filter.index);			
+				this.$.filterCollection.setIndex(this.filter.index);
 			}
 		}
 	},
-	
+
 	// Convert value to entry option
 	convertToEntryOption: function(value) {
 		return {
@@ -216,9 +216,9 @@ enyo.kind({
 			textonly: value.substr(0, 6) == "letter"
 		};
 	},
-	
+
 	// Start game
-	doGame: function(button, event) {		
+	doGame: function(button, event) {
 		// Redraw bar
 		Abcd.changeVisibility(this, {home: false, back: true, filter: false, check: true, itemCount: true});
 		this.themeButton = button;
@@ -227,32 +227,32 @@ enyo.kind({
 		else this.theme = 6;
 		this.$.colorBar.removeClass("themeColor-1");
 		this.$.colorBar.addClass("themeColor"+this.theme);
-		
+
 		// Compute game
 		this.computeGame();
 	},
-	
+
 	// Compute game
 	computeGame: function() {
 		// Compute card to find
 		this.cleanBox();
 		this.forbidentry = false;
 		this.$.itemCount.setContent((this.gamecount+1)+"/"+entriesByGame);
 		var tofind = Abcd.randomEntryIndex(undefined, this.filter);
-		var options = this.convertToEntryOption(this.themeButton.from);		
+		var options = this.convertToEntryOption(this.themeButton.from);
 		var fromEntry = this.from = this.$.box.createComponent(
 			{kind: "Abcd.Entry", index:tofind, soundonly: options["soundonly"], imageonly: options["imageonly"], textonly: options["textonly"], ontap: "entryTaped"},
 			{owner: this}
 		);
 		fromEntry.addClass("entryPlayFrom");
 		fromEntry.render();
-		
+
 		// Play from card if its a sound
 		if (options["soundonly"]) {
 			this.playing = fromEntry;
-			this.playing.play(Abcd.sound);	
+			this.playing.play(Abcd.sound);
 		}
-		
+
 		// Compute cards to choose
 		var excludes = [];
 		excludes.push(tofind);
@@ -261,7 +261,7 @@ enyo.kind({
 			excludes.push(wrong);
 		}
 		excludes = Abcd.mix(excludes);
-		
+
 		// Draw cards
 		var len = excludes.length;
 		for (var i = 0 ; i < len ; i++) {
@@ -273,29 +273,29 @@ enyo.kind({
 			toEntry.addClass("entryPlayTo");
 			toEntry.render();
 		}
-		
+
 		// Save context
-		Abcd.saveContext();		
+		Abcd.saveContext();
 	},
-		
+
 	// Entry taped play sound and/or select entry
 	entryTaped: function(entry, event) {
 		// No selection now
 		if (this.forbidentry)
 			return;
-			
+
 		// Play sound
 		if (entry.soundonly) {
 			if (this.playing != null)
 				this.playing.abort();
 			this.playing = entry;
 			this.playing.play(Abcd.sound);
 		}
-		
+
 		// Don't select the from entry
 		if (entry.hasClass("entryPlayFrom"))
 			return;
-		
+
 		// Select the entry
 		if (!entry.hasClass("entryPlaySelected")) {
 			if (this.selected != null)
@@ -310,6 +310,8 @@ enyo.kind({
 		Abcd.changeVisibility(this, {home: false, back: false, filter: false, check: false, itemCount: false});
 		Abcd.hideLang();
 		this.$.caseButton.hide();
+		this.$.colorBar.removeClass("themeColor"+this.theme);
+		this.$.colorBar.addClass("themeColor-1");
 		var playMode = this;
 		requirejs(["webL10n"], function(webL10n) {
 			playMode.$.gameFinishedMsg.setContent(webL10n.get("GameFinised"));
@@ -322,7 +324,7 @@ enyo.kind({
 		Abcd.showLang();
 		this.$.caseButton.show();
 	},
-	
+
 	replayTaped: function() {
 		this.hideGameFinished();
 		Abcd.changeVisibility(this, {home: false, back: true, filter: false, check: true, itemCount: true});
@@ -334,21 +336,21 @@ enyo.kind({
 		this.hideGameFinished();
 		this.backTaped();
 	},
-	
+
 	// Go to the home of the game
 	backTaped: function() {
 		this.$.colorBar.removeClass("themeColor"+this.theme);
 		this.theme = -1;
 		this.gamecount = 0;
-		this.selected = null;		
+		this.selected = null;
 		this.displayButtons();
 	},
-	
+
 	// Check taped
 	checkTaped: function() {
 		this.forbidentry = true;
 		if (this.playing != null)
-			this.playing.abort();		
+			this.playing.abort();
 		if (this.selected == null) {
 			Abcd.sound.play("audio/disappointed");
 			this.selected = this.from;
@@ -363,27 +365,27 @@ enyo.kind({
 			this.selected.addClass("entryPlayWrong");
 		}
 	},
-	
+
 	// End sound
 	endSound: function(e, s) {
 		// Prematured end
 		if (this.selected == null)
 			return;
-			
+
 		// Bad check, retry
 		if (s.sound == "audio/disappointed") {
 			this.selected.removeClass("entryPlaySelected");
 			this.selected.removeClass("entryPlayWrong");
 			this.selected = null;
 			this.forbidentry = false;
-			
+
 		// Good check
 		} else if (s.sound == "audio/applause") {
 			// Clean state
 			this.selected.removeClass("entryPlaySelected");
 			this.selected.removeClass("entryPlayRight");
-			this.selected = null;	
-			
+			this.selected = null;
+
 			// Next game or try another game
 			if ( ++this.gamecount == entriesByGame ) {
 				this.showGameFinished();