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

Merge branch 'tagSupport' Pull Request #137 Issue #134

Browse source 
Conflicts:
	src/js/git/index.js
This commit is contained in:
Peter Cottle 2013-10-27 12:37:48 -07:00
commit ebfd5e84d2
10 changed files with 647 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/js/models/collections.js
View file

@ -5,6 +5,7 @@ var Backbone = (!require('../util').isBrowser()) ? Backbone = require('backbone'
var Commit = require('../git').Commit;
var Branch = require('../git').Branch;
var Tag = require('../git').Tag;
var Command = require('../models/commandModel').Command;
var CommandEntry = require('../models/commandModel').CommandEntry;
@ -22,6 +23,10 @@ var BranchCollection = Backbone.Collection.extend({
model: Branch
});
var TagCollection = Backbone.Collection.extend({
model: Tag
});
var CommandEntryCollection = Backbone.Collection.extend({
model: CommandEntry,
localStorage: (Backbone.LocalStorage) ? new Backbone.LocalStorage('CommandEntries') : null
@ -125,6 +130,7 @@ var CommandBuffer = Backbone.Model.extend({
exports.CommitCollection = CommitCollection;
exports.CommandCollection = CommandCollection;
exports.BranchCollection = BranchCollection;
exports.TagCollection = TagCollection;
exports.CommandEntryCollection = CommandEntryCollection;
exports.CommandBuffer = CommandBuffer;