Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: siddii/angular-timer
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: alexandrosm/angular-timer
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 6 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 19, 2013

  1. *adds 'timer-end' event and $scope.end function

    *adds 'timer-resumed' and 'timer-started' events
    *BREAKING CHANGE: changes the event emitted after end of countdown from $scope.stop() to $scope.end()
    
    There is a general semantic issue with the 'end' and 'ended' events. They are there to signify both 'pause' and 'end'. This means that the timer is also not properly restarted (or restartable). I assume this comes from the fact that countdown functionality was added later, and that's when the pause/end distinciton is important.
    
    The problem is that simply removing stop() is a hugely breaking change. So I chose to leave it as-is as a 'synonym' for 'pause', and introduced 'end' as a new event. However this means I must make the lesser breaking change of reconfiguring which event gets triggerred on the end of the countdown. This isn't as much of a problem as the use of $scope.stop() was kind of problematic anyway. There was no way to restart the countdown, so you could only really do a countdown once.
    
    Hopefully this change makes sense, let me know if not.
    Alexandros Marinos committed Aug 19, 2013
    Configuration menu
    Copy the full SHA
    b2b2b01 View commit details
    Browse the repository at this point in the history
  2. support "autostart" as an alias to the "auto-start" attribute. Solves…

    … issue #14
    Alexandros Marinos committed Aug 19, 2013
    Configuration menu
    Copy the full SHA
    783e322 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2013

  1. Added attributes for displaying full seconds / minutes / hours

    This change will help me to show a timer like 235:59 (minutes:seconds) if I don't want to show hours or days.
    kersten committed Sep 4, 2013
    Configuration menu
    Copy the full SHA
    c0bb625 View commit details
    Browse the repository at this point in the history
  2. Update timer.js

    added true to fullSeconds
    kersten committed Sep 4, 2013
    Configuration menu
    Copy the full SHA
    78f1803 View commit details
    Browse the repository at this point in the history
  3. Update timer.js

    Updated usage without API
    kersten committed Sep 4, 2013
    Configuration menu
    Copy the full SHA
    71fef68 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #1 from kersten/patch-1

    Added possibility to show full seconds / minutes / hours
    Alexandros Marinos committed Sep 4, 2013
    Configuration menu
    Copy the full SHA
    23b7342 View commit details
    Browse the repository at this point in the history
Loading