Merge pull request git-school#85 from git-school/mkt-fix-safari

Fix Safari support

Author: Michelle Tilley

js/controlbox.js

@@ -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)
     },
 
@@ -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 +

js/historyview.js

@@ -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;
 
@@ -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)
         }
       }