mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-27 16:38:50 +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

32
build/bundle.js
View file

@ -8435,6 +8435,9 @@ var GitError = exports.GitError = MyError.extend({
}); });
require.define("/src/js/views/miscViews.js",function(require,module,exports,__dirname,__filename,process,global){var GitError = require('../util/errors').GitError; require.define("/src/js/views/miscViews.js",function(require,module,exports,__dirname,__filename,process,global){var GitError = require('../util/errors').GitError;
var _ = require('underscore');
// horrible hack to get localStorage Backbone plugin
var Backbone = (!require('../util').isBrowser()) ? Backbone = require('backbone') : Backbone = window.Backbone;
var InteractiveRebaseView = Backbone.View.extend({ var InteractiveRebaseView = Backbone.View.extend({
tagName: 'div', tagName: 'div',
@ -8480,7 +8483,7 @@ var InteractiveRebaseView = Backbone.View.extend({
}, },
toggleVisibility: function(toggle) { toggleVisibility: function(toggle) {
$('#dialogHolder').toggleClass('shown', toggle); this.$el.toggleClass('shown', toggle);
}, },
confirmed: function() { confirmed: function() {
@ -8491,7 +8494,8 @@ var InteractiveRebaseView = Backbone.View.extend({
this.hasClicked = true; this.hasClicked = true;
// first of all hide // first of all hide
this.$el.css('display', 'none'); this.$('#iRebaseDialog').css('display', 'none');
this.hide();
// get our ordering // get our ordering
var uiOrder = []; var uiOrder = [];
@ -9032,7 +9036,11 @@ exports.init = init;
}); });
require.define("/src/js/views/commandViews.js",function(require,module,exports,__dirname,__filename,process,global){var CommandEntryCollection = require('../models/collections').CommandEntryCollection; require.define("/src/js/views/commandViews.js",function(require,module,exports,__dirname,__filename,process,global){var _ = require('underscore');
// 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'); var Main = require('../app');
var Command = require('../models/commandModel').Command; var Command = require('../models/commandModel').Command;
var CommandEntry = require('../models/commandModel').CommandEntry; var CommandEntry = require('../models/commandModel').CommandEntry;
@ -13783,7 +13791,9 @@ exports.GRAPHICS = GRAPHICS;
}); });
require("/src/js/util/constants.js"); require("/src/js/util/constants.js");
require.define("/src/js/util/debug.js",function(require,module,exports,__dirname,__filename,process,global){var toGlobalize = { require.define("/src/js/util/debug.js",function(require,module,exports,__dirname,__filename,process,global){var _ = require('underscore');
var toGlobalize = {
Tree: require('../visuals/tree'), Tree: require('../visuals/tree'),
Visuals: require('../visuals'), Visuals: require('../visuals'),
Git: require('../git'), Git: require('../git'),
@ -13906,7 +13916,11 @@ require.define("/src/js/util/mock.js",function(require,module,exports,__dirname,
}); });
require("/src/js/util/mock.js"); require("/src/js/util/mock.js");
require.define("/src/js/views/commandViews.js",function(require,module,exports,__dirname,__filename,process,global){var CommandEntryCollection = require('../models/collections').CommandEntryCollection; require.define("/src/js/views/commandViews.js",function(require,module,exports,__dirname,__filename,process,global){var _ = require('underscore');
// 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'); var Main = require('../app');
var Command = require('../models/commandModel').Command; var Command = require('../models/commandModel').Command;
var CommandEntry = require('../models/commandModel').CommandEntry; var CommandEntry = require('../models/commandModel').CommandEntry;
@ -14293,6 +14307,9 @@ exports.CommandLineHistoryView = CommandLineHistoryView;
require("/src/js/views/commandViews.js"); require("/src/js/views/commandViews.js");
require.define("/src/js/views/miscViews.js",function(require,module,exports,__dirname,__filename,process,global){var GitError = require('../util/errors').GitError; require.define("/src/js/views/miscViews.js",function(require,module,exports,__dirname,__filename,process,global){var GitError = require('../util/errors').GitError;
var _ = require('underscore');
// horrible hack to get localStorage Backbone plugin
var Backbone = (!require('../util').isBrowser()) ? Backbone = require('backbone') : Backbone = window.Backbone;
var InteractiveRebaseView = Backbone.View.extend({ var InteractiveRebaseView = Backbone.View.extend({
tagName: 'div', tagName: 'div',
@ -14338,7 +14355,7 @@ var InteractiveRebaseView = Backbone.View.extend({
}, },
toggleVisibility: function(toggle) { toggleVisibility: function(toggle) {
$('#dialogHolder').toggleClass('shown', toggle); this.$el.toggleClass('shown', toggle);
}, },
confirmed: function() { confirmed: function() {
@ -14349,7 +14366,8 @@ var InteractiveRebaseView = Backbone.View.extend({
this.hasClicked = true; this.hasClicked = true;
// first of all hide // first of all hide
this.$el.css('display', 'none'); this.$('#iRebaseDialog').css('display', 'none');
this.hide();
// get our ordering // get our ordering
var uiOrder = []; var uiOrder = [];

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

@ -1,5 +1,6 @@
var _ = require('underscore'); 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 CommandEntryCollection = require('../models/collections').CommandEntryCollection;
var Main = require('../app'); var Main = require('../app');

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

@ -1,6 +1,7 @@
var GitError = require('../util/errors').GitError; var GitError = require('../util/errors').GitError;
var _ = require('underscore'); 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({ var InteractiveRebaseView = Backbone.View.extend({
tagName: 'div', tagName: 'div',
@ -46,7 +47,7 @@ var InteractiveRebaseView = Backbone.View.extend({
}, },
toggleVisibility: function(toggle) { toggleVisibility: function(toggle) {
$('#dialogHolder').toggleClass('shown', toggle); this.$el.toggleClass('shown', toggle);
}, },
confirmed: function() { confirmed: function() {
@ -57,7 +58,8 @@ var InteractiveRebaseView = Backbone.View.extend({
this.hasClicked = true; this.hasClicked = true;
// first of all hide // first of all hide
this.$el.css('display', 'none'); this.$('#iRebaseDialog').css('display', 'none');
this.hide();
// get our ordering // get our ordering
var uiOrder = []; var uiOrder = [];