rebase started

This commit is contained in:
Peter Cottle 2013-06-04 14:48:36 -10:00
parent 6931992316
commit 8eff13284f
4 changed files with 180 additions and 243 deletions

View file

@ -191,17 +191,8 @@ AnimationFactory.prototype.genHighlightPromiseAnimation = function(commit, destO
};
AnimationFactory.prototype.playHighlightPromiseAnimation = function(commit, destObj) {
console.log('playing highlight animation');
try {
var animation = this.genHighlightPromiseAnimation(commit, destObj);
console.log('aniamtion duration', animation.get('duration'));
animation.play();
console.log('aniamtion duration', animation.get('duration'));
animation.getPromise();
} catch (e) {
debugger;
console.log(e);
}
return animation.getPromise();
};

View file

@ -30,7 +30,7 @@ var AnimationQueue = Backbone.Model.extend({
index: 0,
callback: null,
defer: false,
promiseBased: false,
promiseBased: false
},
initialize: function(options) {