Merge pull request #16 from brewster1134/2.0.3_event_animation_separation

2.0.4

Author: brewster1134

.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 .sass-cache
 .tmp
 vendor

CHANGELOG.md

@@ -1,5 +1,8 @@
 #### CHANGE LOG
 
+###### 2.0.4
+* separated tiler events from transition
+
 ###### 2.0.3
 * single tile support
 

Newfile

@@ -2,7 +2,7 @@
 sources:
   default: ~/Code/ruby/new-tasks
 name: Tiler
-version: 2.0.2
+version: 2.0.4
 tasks:
   changelog:
   git:

README.md

@@ -208,7 +208,7 @@ npm install
 bower install
 ```
 
-Do **NOT** modify any `.js` files!  Modify the coffee files in the `src` directory.  Guard will watch for changes and compile them to the `lib` directory.
+Do **NOT** modify any `.js` files!  Modify the coffee files in the `src` directory.  Testem will watch for changes and compile them to the `lib` directory.
 
 ### Compiling & Testing
 Run `testem`

lib/tiler.js

@@ -77,8 +77,8 @@ describe 'Tiler', ->
         $tiler.tiler()
         $tiler.tiler 'goTo', 1, false
 
-      it 'should not fire events', ->
-        expect(currentTileViewportSpy).to.not.be.called
+      it 'should fire events', ->
+        expect(currentTileViewportSpy).to.be.called
 
       it 'should not update the tile classes', ->
         # tile 1

spec/tiler_spec.coffee

@@ -2,7 +2,7 @@
 # * tiler
 # * https://github.com/brewster1134/tiler
 # *
-# * @version 2.0.2
+# * @version 2.0.4
 # * @author Ryan Brewster
 # * Copyright (c) 2014
 # * Licensed under the MIT license.
@@ -47,13 +47,15 @@
     goTo: (tileValue, animation) ->
       # Get new active & previous tiles
       $enteringTile = @_getTile tileValue
+      return unless $enteringTile.length
       $exitingTile = @$currentActiveTile
 
-      # Return if we are already on that tile
-      return if !$enteringTile.length || $enteringTile[0] == @$currentActiveTile[0]
-
-      # Update css classes for animation
-      @_transitionCss $enteringTile, $exitingTile, animation
+      if $enteringTile[0] == @$currentActiveTile[0]
+        # Just finalize if we are already on the tile
+        @_finalizeNewTiles $enteringTile, $exitingTile
+      else
+        # Update css classes for animation
+        @_transitionCss $enteringTile, $exitingTile, animation
 
       return $enteringTile