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

adding jquery ui lib

Browse source
This commit is contained in:
Peter Cottle 2012-10-23 22:30:15 -07:00
parent 1a24fa370a
commit b3339c07f1
4 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/jquery-ui-1.9.0.custom.min.js vendored Executable file
View file

File diff suppressed because one or more lines are too long

10
src/git.js
View file

@ -869,10 +869,16 @@ GitEngine.prototype.rebaseInteractive = function(targetSource, currentLocation)
this.animationQueue.set('defer', true); this.animationQueue.set('defer', true);
var callback = _.bind(function(userSpecifiedRebase) { 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); var animationData = this.rebaseFinish(userSpecifiedRebase, {}, targetSource, currentLocation);
animationFactory.rebaseAnimation(this.animationQueue, animationData, this); animationFactory.rebaseAnimation(this.animationQueue, animationData, this);
this.animationQueue.start(); this.animationQueue.start();
}, this); }, this);

2
src/index.html
View file

@ -109,7 +109,7 @@
</script> </script>
<script type="text/html" id="interactive-rebase-entry-template"> <script type="text/html" id="interactive-rebase-entry-template">
<li id="<%= id %>" class="rebaseEntry"> <li id="<%= id %>" class="rebaseEntry transitionAllSlow">
<div class="wrapper"> <div class="wrapper">
<i class="icon-align-justify"></i> <i class="icon-align-justify"></i>
<span class="idwrapper"> <span class="idwrapper">

4
src/miscViews.js
View file

@ -56,6 +56,10 @@ var InteractiveRebaseView = Backbone.View.extend({
}, this); }, this);
this.rebaseCallback(toRebase); this.rebaseCallback(toRebase);
this.$el.html('');
// kill ourselves?
delete this;
}, },
render: function() { render: function() {