merge hell

Author: dsjoerg

app/assets/javascripts/angular/controllers/match.js

@@ -44,7 +44,7 @@ function($scope, $window, $route, $location, $element, Match) {
 //    console.log("matchscope", $scope);
   $scope.$watch('current_frame', function(v) {
     if(v) { 
-      $scope.current_time = Sc2.frameToTime(v); 
+      $scope.current_time = Sc2.frameToTime(v, $scope.match.expansion);
       $scope.time_has_been_set = true
     }
   });

app/assets/javascripts/angular/directives/armychart.js

@@ -115,7 +115,7 @@ gg.directive('armychart', ['$location', '$timeout', function($location, $timeout
       scope.freeze = function(frame, updateURL) {
         switch(typeof frame) {
           case "number": frame = frame; break;
-          case "string": frame = Sc2.timeToFrame(frame); break;
+          case "string": frame = Sc2.timeToFrame(frame, scope.match.expansion); break;
           default: return false;
         }
 
@@ -162,7 +162,7 @@ gg.directive('armychart', ['$location', '$timeout', function($location, $timeout
         if(typeof e == "number") {
           frame = e;
         } else if(typeof e == "string") {
-          frame = Sc2.timeToFrame(e);
+          frame = Sc2.timeToFrame(e, scope.match.expansion);
         } else {
           // If clicked on the background, we have xAxis on the event, if clicked
           // on a series, we'll have the point.

app/assets/javascripts/angular/helpers/sc2.js

@@ -279,7 +279,7 @@ Sc2.timeToFrame = function(time) {
   if (expansion >= 2) {
     fps *= Sc2.LOTV_SPEEDUP;
   }
-    frame = ((minutes*60) + seconds) * fps;
+  frame = ((minutes*60) + seconds) * fps;
   return frame;
 }