mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-26 16:08:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed left right arrows

Browse source
This commit is contained in:
Peter Cottle 2012-12-20 12:22:54 -08:00
parent 7d05c5167d
commit 332c36e090
4 changed files with 9 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

22
build/bundle.js
View file

@ -8545,11 +8545,6 @@ var InteractiveRebaseView = ContainedBase.extend({
destination: this.$('.confirmCancel'), destination: this.$('.confirmCancel'),
deferred: deferred deferred: deferred
}); });
new LeftRightView({
destination: this.$('.confirmCancel'),
deferred: deferred
});
} }
}); });
@ -8662,8 +8657,8 @@ var LeftRightView = PosNegBase.extend({
className: 'leftRightView box horizontal center', className: 'leftRightView box horizontal center',
template: _.template($('#left-right-template').html()), template: _.template($('#left-right-template').html()),
events: { events: {
'click .confirmButton': 'positive', 'click .left': 'negative',
'click .cancelButton': 'negative' 'click .right': 'positive'
}, },
initialize: function(options) { initialize: function(options) {
@ -9177,7 +9172,7 @@ var init = function(){
if (/\?demo/.test(window.location.href)) { if (/\?demo/.test(window.location.href)) {
setTimeout(function() { 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); }, 500);
} }
}; };
@ -11529,7 +11524,7 @@ var init = function(){
if (/\?demo/.test(window.location.href)) { if (/\?demo/.test(window.location.href)) {
setTimeout(function() { 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); }, 500);
} }
}; };
@ -14553,8 +14548,8 @@ var LeftRightView = PosNegBase.extend({
className: 'leftRightView box horizontal center', className: 'leftRightView box horizontal center',
template: _.template($('#left-right-template').html()), template: _.template($('#left-right-template').html()),
events: { events: {
'click .confirmButton': 'positive', 'click .left': 'negative',
'click .cancelButton': 'negative' 'click .right': 'positive'
}, },
initialize: function(options) { initialize: function(options) {
@ -14933,11 +14928,6 @@ var InteractiveRebaseView = ContainedBase.extend({
destination: this.$('.confirmCancel'), destination: this.$('.confirmCancel'),
deferred: deferred deferred: deferred
}); });
new LeftRightView({
destination: this.$('.confirmCancel'),
deferred: deferred
});
} }
}); });

2
src/js/app/index.js
View file

@ -20,7 +20,7 @@ var init = function(){
if (/\?demo/.test(window.location.href)) { if (/\?demo/.test(window.location.href)) {
setTimeout(function() { 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); }, 500);
} }
}; };

4
src/js/views/index.js
View file

@ -61,8 +61,8 @@ var LeftRightView = PosNegBase.extend({
className: 'leftRightView box horizontal center', className: 'leftRightView box horizontal center',
template: _.template($('#left-right-template').html()), template: _.template($('#left-right-template').html()),
events: { events: {
'click .confirmButton': 'positive', 'click .left': 'negative',
'click .cancelButton': 'negative' 'click .right': 'positive'
}, },
initialize: function(options) { initialize: function(options) {

5
src/js/views/rebaseView.js
View file

@ -110,11 +110,6 @@ var InteractiveRebaseView = ContainedBase.extend({
destination: this.$('.confirmCancel'), destination: this.$('.confirmCancel'),
deferred: deferred deferred: deferred
}); });
new LeftRightView({
destination: this.$('.confirmCancel'),
deferred: deferred
});
} }
}); });