mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-06-27 00:18:56 +02:00
adding jquery ui lib
This commit is contained in:
parent
1a24fa370a
commit
b3339c07f1
4 changed files with 19 additions and 3 deletions
6
lib/jquery-ui-1.9.0.custom.min.js
vendored
Executable file
6
lib/jquery-ui-1.9.0.custom.min.js
vendored
Executable file
File diff suppressed because one or more lines are too long
10
src/git.js
10
src/git.js
|
@ -869,10 +869,16 @@ GitEngine.prototype.rebaseInteractive = function(targetSource, currentLocation)
|
|||
this.animationQueue.set('defer', true);
|
||||
|
||||
var callback = _.bind(function(userSpecifiedRebase) {
|
||||
// first, they might have dropped everything (annoying)
|
||||
if (!userSpecifiedRebase.length) {
|
||||
this.command.setResult('Nothing to do...');
|
||||
this.animationQueue.start();
|
||||
return;
|
||||
}
|
||||
|
||||
// finish the rebase crap and animate!
|
||||
var animationData = this.rebaseFinish(userSpecifiedRebase, {}, targetSource, currentLocation);
|
||||
|
||||
animationFactory.rebaseAnimation(this.animationQueue, animationData, this);
|
||||
|
||||
this.animationQueue.start();
|
||||
}, this);
|
||||
|
||||
|
|
|
@ -109,7 +109,7 @@
|
|||
</script>
|
||||
|
||||
<script type="text/html" id="interactive-rebase-entry-template">
|
||||
<li id="<%= id %>" class="rebaseEntry">
|
||||
<li id="<%= id %>" class="rebaseEntry transitionAllSlow">
|
||||
<div class="wrapper">
|
||||
<i class="icon-align-justify"></i>
|
||||
<span class="idwrapper">
|
||||
|
|
|
@ -56,6 +56,10 @@ var InteractiveRebaseView = Backbone.View.extend({
|
|||
}, this);
|
||||
|
||||
this.rebaseCallback(toRebase);
|
||||
|
||||
this.$el.html('');
|
||||
// kill ourselves?
|
||||
delete this;
|
||||
},
|
||||
|
||||
render: function() {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue