combonumber

diversify · Nov 23, 2014 · 9184af7 · 9184af7
1 parent da7d740
commit 9184af7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/app/controllers/controllers.js b/app/controllers/controllers.js
@@ -27,6 +27,15 @@ app.controller('januController', ['$scope','$http','$interval', function ($scope
     $scope.comboplyer = 1;
     $scope.roundActive = false;
 
+
+    var loopImages = function(){
+
+         $('#combo-div').fadeIn(1500, function(){
+
+                   $('#combo-div').fadeOut(1500, loopImages);           
+         });
+    }
+    loopImages();
 
     // this is the first song the user guesses
     firstSong = fetchNewSong();

diff --git a/app/partials/game.html b/app/partials/game.html
@@ -32,6 +32,6 @@ <h2 id="question">Which timespan?</h2>
 </div>
 
 <div id="game-footer"><h2 id="score">SCORE <em>{{score.total}}</em><em class="emergency">{{(score.round!=0 && ' + ' + score.round + (' x ' + comboplyer)|| '')}}</em></h2><h2 id="round">CORRECT GUESSES {{timelineSongs.length}} / 10</h2></div>
-<img src="content/image/combo-icon.png" alt="COMBO" id="combo" />
+<div id="combo-div"><div><em>{{comboplyer}}</em></div><img src="content/image/combo-icon.png" alt="COMBO" id="combo" /></div>