From ab2562b83ba3dddd2a153a03faa5f2df069ab5da Mon Sep 17 00:00:00 2001 From: Juraj Michalek Date: Mon, 29 Dec 2014 14:23:20 +0000 Subject: [PATCH] fix return completed level --- js/level-complete-controller.js | 5 +++++ js/pexeso-controller.js | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/js/level-complete-controller.js b/js/level-complete-controller.js index 1525660..8c8e161 100644 --- a/js/level-complete-controller.js +++ b/js/level-complete-controller.js @@ -30,6 +30,11 @@ angular.module('level-complete', []) $rootScope.$emit('startLevel', args); }; + $scope.cancelLevel = function() { + $scope.isLevelCompleteVisible = false; + }; + $rootScope.$on('completeLevel', $scope.completeLevel); + $rootScope.$on('cancelLevel', $scope.cancelLevel); }); \ No newline at end of file diff --git a/js/pexeso-controller.js b/js/pexeso-controller.js index b1e9513..d697930 100644 --- a/js/pexeso-controller.js +++ b/js/pexeso-controller.js @@ -59,22 +59,22 @@ angular.module('app', ['angular-flippy', 'level-selector', 'level-complete']) cardTypes: ['picture', 'picture', 'picture', 'picture'] }, { levelName: "04: Simple Math", - totalCards: 3*2, - cardsPerRow: 3, + totalCards: 4*4, + cardsPerRow: 4, chainLength: 2, cardSet: mathCards, cardTypes: ['arabic', 'math'] }, { levelName: "05: Roman", - totalCards: 3*2, - cardsPerRow: 3, + totalCards: 4*4, + cardsPerRow: 4, chainLength: 2, cardSet: mathCards, cardTypes: ['arabic', 'roman'] }, { levelName: "06: Japanese", - totalCards: 3*2, - cardsPerRow: 3, + totalCards: 4*4, + cardsPerRow: 4, chainLength: 2, cardSet: mathCards, cardTypes: ['arabic', 'japanese']