awesome have rebase done

This commit is contained in:
Peter Cottle 2013-08-01 00:20:28 -07:00
parent 86cbb19a28
commit 8b66edc878
9 changed files with 573 additions and 45 deletions

View file

@ -2,10 +2,11 @@ var _ = require('underscore');
var Q = require('q');
var Backbone = require('backbone');
var GLOBAL = require('../../util/constants').GLOBAL;
var GRAPHICS = require('../../util/constants').GRAPHICS;
var Animation = Backbone.Model.extend({
defaults: {
duration: 300,
duration: GRAPHICS.defaultAnimationTime,
closure: null
},
@ -102,7 +103,7 @@ var PromiseAnimation = Backbone.Model.extend({
defaults: {
deferred: null,
closure: null,
duration: 300
duration: GRAPHICS.defaultAnimationTime
},
initialize: function(options) {