Skip to content

Commit

Permalink
don't disable button, already checked in model
Browse files Browse the repository at this point in the history
  • Loading branch information
forresto committed May 13, 2013
1 parent 811d9b0 commit 001faf4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion assets/js/models.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ var MFAApp = Backbone.Model.extend({
},
initialize: function() {
this.set('settings', new AnimationSettings());
this.get('settings').on('change:rate change:quality change:animHeight change:animWidth', function() { this.set('animatedGIF', null); }, this);
this.get('settings').on('change:rate change:quality change:animHeight change:animWidth', function() {
this.set('animatedGIF', null);
}, this);

this.set('timeline', new Timeline());
},
Expand Down
4 changes: 2 additions & 2 deletions assets/js/ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ var AnimateButtonView = Backbone.View.extend({
this.model.on('animationGenerated', this.done, this);
},
generateAnimation: function(e) {
$(this.el).text("Setting up GIF encode...").prop("disabled", true);
$(this.el).text("Setting up GIF encode...");
this.model.generateAnimatedGIF({
progress: this.progress
});
Expand All @@ -18,7 +18,7 @@ var AnimateButtonView = Backbone.View.extend({
$(this.el).text( Math.round(percent*100)+"% encoded..." );
},
done: function (info) {
$(this.el).text( this.initialLabel ).prop("disabled", false);;
$(this.el).text( this.initialLabel );
}
});

Expand Down

0 comments on commit 001faf4

Please sign in to comment.