Merge pull request #11 from brewster1134/animation_boolean

animation boolean

Author: brewster1134

CHANGELOG.md

@@ -1,5 +1,8 @@
 #### CHANGE LOG
 
+###### 1.0.4
+* allow passing a boolean for `goTo` method's animation argument
+
 ###### 1.0.3
 * improved sizing of viewport
 

Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    sass (3.4.19)
+    sass (3.4.22)
 
 PLATFORMS
   ruby
@@ -10,4 +10,4 @@ DEPENDENCIES
   sass (~> 3.4)
 
 BUNDLED WITH
-   1.10.6
+   1.12.1

Newfile

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

lib/tiler.js

@@ -79,6 +79,25 @@ describe 'Tiler', ->
       it 'should add the active class', ->
         expect($('#go-to #tile-1').hasClass('foo-animation')).to.be.true
 
+    context 'when passing a boolean to active class', ->
+      before ->
+        $('#tile-1', '#go-to').data 'tiler-animation', 'goto-animate-1'
+        $('#tile-2', '#go-to').data 'tiler-animation', 'goto-animate-2'
+
+      context 'when passing true', ->
+        before ->
+          $('#go-to').tiler('goTo', 2, true)
+
+        it 'should add the active class from the first tile', ->
+          expect($('#go-to #tile-2').hasClass('goto-animate-2')).to.be.true
+
+      context 'when passing false', ->
+        before ->
+          $('#go-to').tiler('goTo', 1, false)
+
+        it 'should add the active class', ->
+          expect($('#go-to #tile-1').hasClass('no-active-class')).to.be.true
+
   describe 'refresh', ->
     newWidth = null
     newHeight = null

spec/tiler_spec.coffee

@@ -2,7 +2,7 @@
 # * tiler
 # * https://github.com/brewster1134/tiler
 # *
-# * @version 1.0.3
+# * @version 1.0.4
 # * @author Ryan Brewster
 # * Copyright (c) 2014
 # * Licensed under the MIT license.
@@ -45,7 +45,7 @@
       @element.trigger 'tiler.refresh'
       @$enterTile?.trigger 'tiler.refresh'
 
-    goTo: (tile, animation) ->
+    goTo: (tile, animation = true) ->
       # Find tile
       # Tile id as string
       $tile = if typeof tile == 'string'
@@ -70,14 +70,8 @@
       # Set the active tile id to the viewport
       @element.attr 'data-tiler-active-tile', @$enterTile.attr('id')
 
-      # Set tile class
-      animationClass = if animation == false
-        'no-active-class'
-      else
-        animation || @$enterTile.data('tiler-animation') || ''
-
       # Manage css classes if an one is specified
-      @_transitionCss animationClass
+      @_transitionCss @_getAnimationClass animation
 
       # Fire js events
       # Trigger on viewport
@@ -97,6 +91,16 @@
     #
     # PRIVATE METHODS
     #
+    _getAnimationClass: (animation) ->
+      # return explicitly passed animation
+      return animation if typeof animation == 'string'
+
+      # use animaton from markup if true, and no-active-class for false
+      if animation
+        @$enterTile.data('tiler-animation') || ''
+      else
+        'no-active-class'
+
     _transitionCss: (animationClass) ->
       enterTileId = @$tiles.index(@$enterTile, @$exitTile) + 1