From c9bfac733f981d6f5ab8790d20e8f403e875a128 Mon Sep 17 00:00:00 2001 From: Jarrod Payne Date: Mon, 9 Jun 2014 13:13:42 -0400 Subject: [PATCH] Bump to 0.3.1 Signed-off-by: Jarrod Payne --- bower.json | 2 +- dist/MarionetteTransition.js | 2 +- dist/amd/MarionetteTransition.js | 14 +++----------- dist/amd/regions/Fade.js | 2 +- package.json | 2 +- 5 files changed, 7 insertions(+), 15 deletions(-) diff --git a/bower.json b/bower.json index 32d62ee..c4fc7bf 100644 --- 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 index 149d077..d4de77e 100644 --- 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 index 8edd6a1..6585a0e 100644 --- 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 index 4059402..dc27c85 100644 --- 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 index e99aeb8..4ff19dd 100644 --- 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",