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

PR #196 code cleanup and solution description rather than reordering

Browse source
This commit is contained in:
Peter Cottle 2014-08-13 19:22:45 -07:00
parent ffc974e03f
commit 90c39417bb
4 changed files with 27 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,54 +13,24 @@ var InteractiveRebaseView = ContainedBase.extend({
tagName: 'div',
template: _.template($('#interactive-rebase-template').html()),
createRebaseEntries: function() {
initialize: function(options) {
this.deferred = options.deferred;
this.rebaseMap = {};
this.entryObjMap = {};
this.rebaseEntries = new RebaseEntryCollection();
// If we are displaying a solution, we potentially only want to pick certain commits, and reorder
// the ones that are picked. The commits we want to pick and the order are contained in the options.initialCommitOrdering,
// the list of all the commits that are part of the rebase are in options.toRebase
var commitsToUse = this.options.initialCommitOrdering === undefined ? this.options.toRebase
: this.options.initialCommitOrdering;
this.options = options;
_.each(commitsToUse, function(commit) {
this.rebaseEntries = new RebaseEntryCollection();
options.toRebase.reverse();
_.each(options.toRebase, function(commit) {
var id = commit.get('id');
this.rebaseMap[id] = commit;
// make basic models for each commit
this.entryObjMap[id] = new RebaseEntry({
id: id,
pick: true
id: id
});
this.rebaseEntries.add(this.entryObjMap[id]);
}, this);
// If we are using the initialCommitOrdering, we might not have picked all of the commits,
// but we would still want to see the other unpicked ones. Just show them as unpicked by default
if (this.options.initialCommitOrdering !== undefined) {
_.each(this.options.toRebase, function(commit) {
var id = commit.get('id');
if (!(id in this.rebaseMap)) {
this.rebaseMap[id] = commit;
// make basic models for each commit
this.entryObjMap[id] = new RebaseEntry({
id: id,
pick: false
});
}
this.rebaseEntries.add(this.entryObjMap[id]);
}, this);
}
},
initialize: function(options) {
this.deferred = options.deferred;
this.options = options;
this.createRebaseEntries();
this.container = new ModalTerminal({
title: 'Interactive Rebase'
@ -110,7 +80,8 @@ var InteractiveRebaseView = ContainedBase.extend({
render: function() {
var json = {
num: _.keys(this.rebaseMap).length
num: _.keys(this.rebaseMap).length,
solutionOrder: this.options.initialCommitOrdering
};
var destination = this.container.getInsideElement();
@ -200,7 +171,6 @@ var RebaseEntryView = Backbone.View.extend({
// hacky :( who would have known jquery barfs on ids with %'s and quotes
this.listEntry = this.$el.children(':last');
this.listEntry.toggleClass('notPicked', !this.model.get('pick'));
this.listEntry.delegate('#toggleButton', 'click', _.bind(function() {
this.toggle();