diff --git a/src/js/views/index.js b/src/js/views/index.js index 2be7b358..ccebfffe 100644 --- a/src/js/views/index.js +++ b/src/js/views/index.js @@ -140,7 +140,8 @@ var ConfirmCancelView = ResolveRejectBase.extend({ this.deferred = options.deferred || Q.defer(); this.JSON = { confirm: options.confirm || intl.str('confirm-button'), - cancel: options.cancel || intl.str('cancel-button') + cancel: options.cancel || intl.str('cancel-button'), + disableCancelButton: !!options.disableCancelButton, }; this.render(); diff --git a/src/js/views/rebaseView.js b/src/js/views/rebaseView.js index a4ebfd0d..aaffe3b7 100644 --- a/src/js/views/rebaseView.js +++ b/src/js/views/rebaseView.js @@ -142,7 +142,8 @@ var InteractiveRebaseView = ContainedBase.extend({ // finally get our buttons new ConfirmCancelView({ destination: this.$('.confirmCancel'), - deferred: deferred + deferred: deferred, + disableCancelButton: !!this.options.aboveAll, }); } }); diff --git a/src/template.index.html b/src/template.index.html index ff4aefd2..72e135fb 100644 --- a/src/template.index.html +++ b/src/template.index.html @@ -326,9 +326,13 @@