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

Merge pull request #763 from ignite1771/master

Browse source 
Fix multiple paragraph tags of 'log' and 'show'
This commit is contained in:
Peter Cottle 2020-12-27 09:39:32 -07:00 • committed by GitHub
commit feed75440c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/js/git/index.js
View file

@ -2922,30 +2922,27 @@ var Commit = Backbone.Model.extend({
}, },
getLogEntry: function() { getLogEntry: function() {
// for now we are just joining all these things with newlines which
// will get placed by paragraph tags. Not really a fan of this, but
// it's better than making an entire template and all that jazz
return [ return [
'Author: ' + this.get('author'), 'Author: ' + this.get('author'),
'Date: ' + this.get('createTime'), 'Date: ' + this.get('createTime'),
'<br/>', '',
this.get('commitMessage'), this.get('commitMessage'),
'<br/>', '',
'Commit: ' + this.get('id') 'Commit: ' + this.get('id')
].join('\n' ) + '\n'; ].join('<br/>') + '\n';
}, },
getShowEntry: function() { getShowEntry: function() {
// same deal as above, show log entry and some fake changes // same deal as above, show log entry and some fake changes
return [ return [
this.getLogEntry(), this.getLogEntry().replace('\n', ''),
'diff --git a/bigGameResults.html b/bigGameResults.html', 'diff --git a/bigGameResults.html b/bigGameResults.html',
'--- bigGameResults.html', '--- bigGameResults.html',
'+++ bigGameResults.html', '+++ bigGameResults.html',
'@@ 13,27 @@ Winner, Score', '@@ 13,27 @@ Winner, Score',
'- Stanfurd, 14-7', '- Stanfurd, 14-7',
'+ Cal, 21-14' '+ Cal, 21-14'
].join('\n') + '\n'; ].join('<br/>') + '\n';
}, },
validateAtInit: function() { validateAtInit: function() {