Bump to 0.3.1

Signed-off-by: Jarrod Payne <[email protected]>
paynecodes · Jun 9, 2014 · c9bfac7 · c9bfac7
1 parent 1f8ac02
commit c9bfac7
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 15 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
 	"name": "MarionetteTransition",
 	"description": "Make your dancing Marionette apps transition beautifully.",
-	"version": "0.3.0",
+	"version": "0.3.1",
 	"private": false,
 	"license": "MIT",
 	"main": [

diff --git a/dist/MarionetteTransition.js b/dist/MarionetteTransition.js
@@ -1,5 +1,5 @@
 /*
-** MarionetteTransition v0.3.0
+** MarionetteTransition v0.3.1
 ** Description: Make your dancing Marionette apps transition beautifully.
 ** Author: Jarrod Payne
 ** Company: Webotomy

diff --git a/dist/amd/MarionetteTransition.js b/dist/amd/MarionetteTransition.js
@@ -1,12 +1,12 @@
 /*
-** MarionetteTransition v0.3.0
+** MarionetteTransition v0.3.1
 ** Description: Make your dancing Marionette apps transition beautifully.
 ** Author: Jarrod Payne
 ** Company: Webotomy
 ** License: MIT
 **
 ** Thanks to @jasonlaster and @jmeas for the help.
-*/
+*/ 
 
 define(['jquery', 'underscore', 'backbone.marionette', 'TweenLite', 'CSSPlugin', 'animations/horizontalSlideToPosition'], function($, _, Marionette, TweenLite, CSSPlugin, horizontalSlideToPosition) {
     'use strict';
@@ -248,15 +248,7 @@ define(['jquery', 'underscore', 'backbone.marionette', 'TweenLite', 'CSSPlugin',
 
             function delay() {
                 /*jshint validthis:true */
-                if (_.isFunction(options.beforeAnimate)) {
-                    $.when(options.beforeAnimate()).then(_.bind(function() {
-                        _.delay(_.bind(transition, this), 50);
-                    }, this));
-                } else {
-                    $.when(options.beforeAnimate).then(_.bind(function() {
-                        _.delay(_.bind(transition, this), 50);
-                    }, this));
-                }
+                _.delay(_.bind(transition, this), 50);
             }
 
             // Don't worry too much about this mess.

diff --git a/dist/amd/regions/Fade.js b/dist/amd/regions/Fade.js
@@ -29,7 +29,7 @@ define(['jquery', 'underscore', 'backbone.marionette', 'TweenLite', 'CSSPlugin',
             return opacity(view.$el, _.extend(options, { 'opacity': '1' }));
         },
         exitAnimation: function(view, options) {
-            return opacity(view.$el, _.extend(options, { 'opacity': '0', duration: 0.2 }));
+            return opacity(view.$el, _.extend(options, { 'opacity': '0' }));
         }
     });
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "MarionetteTransition",
     "description": "Make your dancing Marionette apps transition beautifully.",
-    "version": "0.3.0",
+    "version": "0.3.1",
     "license": "MIT",
     "repository": {
         "type": "git",