From 332c36e0904a0f6bad3e1139d61b23f0c41afaa2 Mon Sep 17 00:00:00 2001 From: Peter Cottle Date: Thu, 20 Dec 2012 12:22:54 -0800 Subject: [PATCH] removed left right arrows --- build/bundle.js | 22 ++++++---------------- src/js/app/index.js | 2 +- src/js/views/index.js | 4 ++-- src/js/views/rebaseView.js | 5 ----- 4 files changed, 9 insertions(+), 24 deletions(-) diff --git a/build/bundle.js b/build/bundle.js index cd925a66..13f92f27 100644 --- a/build/bundle.js +++ b/build/bundle.js @@ -8545,11 +8545,6 @@ var InteractiveRebaseView = ContainedBase.extend({ destination: this.$('.confirmCancel'), deferred: deferred }); - - new LeftRightView({ - destination: this.$('.confirmCancel'), - deferred: deferred - }); } }); @@ -8662,8 +8657,8 @@ var LeftRightView = PosNegBase.extend({ className: 'leftRightView box horizontal center', template: _.template($('#left-right-template').html()), events: { - 'click .confirmButton': 'positive', - 'click .cancelButton': 'negative' + 'click .left': 'negative', + 'click .right': 'positive' }, initialize: function(options) { @@ -9177,7 +9172,7 @@ var init = function(){ if (/\?demo/.test(window.location.href)) { setTimeout(function() { - events.trigger('submitCommandValueFromEvent', "gc; git checkout HEAD~1; git commit; git checkout -b bugFix; gc; gc; git rebase master; git checkout master; gc; gc; git merge bugFix"); + events.trigger('submitCommandValueFromEvent', "gc; git checkout HEAD~1; git commit; git checkout -b bugFix; gc; gc; git rebase -i HEAD~2; git rebase master; git checkout master; gc; gc; git merge bugFix"); }, 500); } }; @@ -11529,7 +11524,7 @@ var init = function(){ if (/\?demo/.test(window.location.href)) { setTimeout(function() { - events.trigger('submitCommandValueFromEvent', "gc; git checkout HEAD~1; git commit; git checkout -b bugFix; gc; gc; git rebase master; git checkout master; gc; gc; git merge bugFix"); + events.trigger('submitCommandValueFromEvent', "gc; git checkout HEAD~1; git commit; git checkout -b bugFix; gc; gc; git rebase -i HEAD~2; git rebase master; git checkout master; gc; gc; git merge bugFix"); }, 500); } }; @@ -14553,8 +14548,8 @@ var LeftRightView = PosNegBase.extend({ className: 'leftRightView box horizontal center', template: _.template($('#left-right-template').html()), events: { - 'click .confirmButton': 'positive', - 'click .cancelButton': 'negative' + 'click .left': 'negative', + 'click .right': 'positive' }, initialize: function(options) { @@ -14933,11 +14928,6 @@ var InteractiveRebaseView = ContainedBase.extend({ destination: this.$('.confirmCancel'), deferred: deferred }); - - new LeftRightView({ - destination: this.$('.confirmCancel'), - deferred: deferred - }); } }); diff --git a/src/js/app/index.js b/src/js/app/index.js index 6c1660e6..5bcbddf3 100644 --- a/src/js/app/index.js +++ b/src/js/app/index.js @@ -20,7 +20,7 @@ var init = function(){ if (/\?demo/.test(window.location.href)) { setTimeout(function() { - events.trigger('submitCommandValueFromEvent', "gc; git checkout HEAD~1; git commit; git checkout -b bugFix; gc; gc; git rebase master; git checkout master; gc; gc; git merge bugFix"); + events.trigger('submitCommandValueFromEvent', "gc; git checkout HEAD~1; git commit; git checkout -b bugFix; gc; gc; git rebase -i HEAD~2; git rebase master; git checkout master; gc; gc; git merge bugFix"); }, 500); } }; diff --git a/src/js/views/index.js b/src/js/views/index.js index 1c0f25c7..733dd856 100644 --- a/src/js/views/index.js +++ b/src/js/views/index.js @@ -61,8 +61,8 @@ var LeftRightView = PosNegBase.extend({ className: 'leftRightView box horizontal center', template: _.template($('#left-right-template').html()), events: { - 'click .confirmButton': 'positive', - 'click .cancelButton': 'negative' + 'click .left': 'negative', + 'click .right': 'positive' }, initialize: function(options) { diff --git a/src/js/views/rebaseView.js b/src/js/views/rebaseView.js index 53891b02..4554226a 100644 --- a/src/js/views/rebaseView.js +++ b/src/js/views/rebaseView.js @@ -110,11 +110,6 @@ var InteractiveRebaseView = ContainedBase.extend({ destination: this.$('.confirmCancel'), deferred: deferred }); - - new LeftRightView({ - destination: this.$('.confirmCancel'), - deferred: deferred - }); } });