Skip to content

Fix Safari support #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BinaryMuse merged 1 commit into from
Sep 13, 2016
Merged

Fix Safari support #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions js/controlbox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,9 @@ function(_yargs, d3, demos) {
return this.error("'git log' can take at most one argument in this tool")
}
var logs = this.getRepoView().getLogEntries(args[0] || 'head')
.map(l => `<span class='log-entry'>&gt; ${l}</span>`).join('')
.map(function(l) {
return "<span class='log-entry'>&gt; " + l + "</span>"
}).join('')
this.info(logs)
},

Expand Down Expand Up @@ -878,7 +880,9 @@ function(_yargs, d3, demos) {
} else if (subcommand === "show") {
var logs = this.getRepoView().getReflogEntries(ref)
this.info(
logs.map(l => `<span class='reflog-entry'>&gt; ${l}</span>`).join('')
logs.map(function(l) {
return "<span class='reflog-entry'>&gt; " + l + "</span>"
}).join('')
)
} else if (subcommand === "expire" || subcommand === "delete") {
this.info("Real git reflog supports the '" + subcommand +
Expand Down
14 changes: 7 additions & 7 deletions js/historyview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -844,6 +844,12 @@ define(['d3'], function() {
return tagData;
},

_walkCommit: function (commit) {
commit.branchless = false
commit.parent && this._walkCommit(this.getCommit(commit.parent))
commit.parent2 && this._walkCommit(this.getCommit(commit.parent2))
},

_markBranchlessCommits: function() {
var branch, commit, parent, parent2, c, b;

Expand All @@ -859,13 +865,7 @@ define(['d3'], function() {
parent = this.getCommit(commit.parent);
parent2 = this.getCommit(commit.parent2);

function walkCommit (commit) {
commit.branchless = false
commit.parent && walkCommit.call(this, this.getCommit(commit.parent))
commit.parent2 && walkCommit.call(this, this.getCommit(commit.parent2))
}

walkCommit.call(this, commit)
this._walkCommit(commit)
}
}

Expand Down