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

multiple rebases fixed

Browse source
This commit is contained in:
Peter Cottle 2012-12-19 16:08:29 -08:00
parent 26c04c7e0e
commit 41429e0ce6
3 changed files with 32 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/js/views/commandViews.js
View file

@ -1,5 +1,6 @@
var _ = require('underscore');
var Backbone = require('backbone');
// horrible hack to get localStorage Backbone plugin
var Backbone = (!require('../util').isBrowser()) ? Backbone = require('backbone') : Backbone = window.Backbone;
var CommandEntryCollection = require('../models/collections').CommandEntryCollection;
var Main = require('../app');

8
src/js/views/miscViews.js
View file

@ -1,6 +1,7 @@
var GitError = require('../util/errors').GitError;
var _ = require('underscore');
var Backbone = require('backbone');
// horrible hack to get localStorage Backbone plugin
var Backbone = (!require('../util').isBrowser()) ? Backbone = require('backbone') : Backbone = window.Backbone;
var InteractiveRebaseView = Backbone.View.extend({
tagName: 'div',
@ -46,7 +47,7 @@ var InteractiveRebaseView = Backbone.View.extend({
},
toggleVisibility: function(toggle) {
$('#dialogHolder').toggleClass('shown', toggle);
this.$el.toggleClass('shown', toggle);
},
confirmed: function() {
@ -57,7 +58,8 @@ var InteractiveRebaseView = Backbone.View.extend({
this.hasClicked = true;
// first of all hide
this.$el.css('display', 'none');
this.$('#iRebaseDialog').css('display', 'none');
this.hide();
// get our ordering
var uiOrder = [];