Start time and autostart working togheter now

glaucocustodio · glaucocustodio · commit a5b10062803a · 2014-09-17T12:16:46.000-03:00
diff --git a/app/js/timer.js b/app/js/timer.js
@@ -106,7 +106,9 @@ var timerModule = angular.module('timer', [])
         });
 
         function calculateTimeUnits() {
-
+          if ($attrs.startTime !== undefined){
+            $scope.millis = new Date() - new Date($scope.startTimeAttr);
+          }
           // compute time values based on maxTimeUnit specification
           if (!$scope.maxTimeUnit || $scope.maxTimeUnit === 'day') {
             $scope.seconds = Math.floor(($scope.millis / 1000) % 60);
@@ -151,7 +153,6 @@ var timerModule = angular.module('timer', [])
             $scope.months = Math.floor((($scope.millis / (3600000)) / 24 / 30) % 12);
             $scope.years = Math.floor(($scope.millis / (3600000)) / 24 / 365);
           }
-
           // plural - singular unit decision
           $scope.secondsS = $scope.seconds == 1 ? '' : 's';
           $scope.minutesS = $scope.minutes == 1 ? '' : 's';
diff --git a/examples/timer-with-autostart-false-and-starttime.html b/examples/timer-with-autostart-false-and-starttime.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Start Time and Auto Start set - Timer Example</title>
+    <script src="../bower_components/angular/angular.min.js"></script>
+    <script src="../app/js/timer.js"></script>
+</head>
+<body ng-app="timer">
+<div id="start-time-and-auto-start-set">
+    <h2>Start Time and Auto Start set - Timer Example</h2>
+    <h3><timer start-time="1410914940000" autostart="false"></timer></h3>
+</div>
+<br/>
+</body>
+</html>
diff --git a/index.html b/index.html
@@ -49,6 +49,17 @@ <h3>
         <button class="btn" onclick="stopTimer('basic-timer')" type="button">Stop</button>
     </div>
 </section>
+<section id="start-time-and-auto-start-set">
+    <h3>Timer with start time and auto start set</h3>
+
+    <div class="bs-docs-example">
+        <p>This will start a timer with 1410914940000 milliseconds and stopped</p>
+        
+        <h3>
+            <timer start-time="1410914940000" autostart="false"></timer>
+        </h3>
+    </div>
+</section>
 <section id="clock-timer">
     <h3>
         Timer with hours, minutes &amp; seconds</h3>
diff --git a/test/e2e/scenarios.js b/test/e2e/scenarios.js
@@ -155,6 +155,10 @@ describe('Angular Timer E2E Tests', function () {
     
   });  
 
+  it('Start time with auto start', function() {
+    expect(element('#start-time-and-auto-start-set timer span').html()).toBeGreaterThan(1000);
+  });
+
   it('Countdown timer with maxTimeUnit- should display time value from lower to specified maxTimeUnit', function() {
     var timer1Val = element('#max-time-unit-countdown-timer .WithMaxTimeUnitAsMinute timer').text();
 
