Merge branch 'master' into mkt-better-ref-matching

Author: Michelle Tilley

css/explaingit.css

@@ -134,7 +134,7 @@ span.cmd {
 
 .control-box input[type="text"] {
     position: absolute;
-    bottom: 0; 
+    bottom: 0;
     padding-left: 15px;
     color: #FFF;
     line-height: 14px;

index.html

@@ -523,12 +523,12 @@ <h2>Specific Examples</h2>
 
     window.addEventListener('hashchange', open, false);
     window.addEventListener('load', open, false);
-    
+
     function open() {
         var hash = window.location.hash.substr(1),
             linkId = 'open-' + hash,
             example = examples[hash];
-        
+
         if (example) {
             explainGit.reset();
             document.getElementById(linkId).classList.add('selected');
@@ -540,7 +540,7 @@ <h2>Specific Examples</h2>
               elements[i].style.display = 'none';
             }
             document.getElementById('fork-me').style.display = 'none';
-            
+
             explainGit.reset();
 
             explainGit.open({

js/controlbox.js

@@ -239,7 +239,7 @@ define(['d3'], function () {
 
                 return;
             }
-            
+
             while (args.length > 0) {
                 var arg = args.shift();
 

js/explaingit.js

@@ -71,4 +71,4 @@ define(['historyview', 'controlbox', 'd3'], function (HistoryView, ControlBox, d
     window.explainGit = explainGit;
 
     return explainGit;
-});
+});

js/historyview.js

@@ -309,14 +309,14 @@ define(['d3'], function () {
                     break;
                 }
 
-                var matchedTag = function() { 
+                var matchedTag = function() {
                     for (var j = 0; j < commit.tags.length; j++) {
                         var tag = commit.tags[j];
                         if (tag === ref) {
                             matchedCommit = commit;
                             return true;
                         }
-                        
+
                         if (tag.indexOf('[') === 0 && tag.indexOf(']') === tag.length - 1) {
                             tag = tag.substring(1, tag.length - 1);
                         }
@@ -401,7 +401,7 @@ define(['d3'], function () {
             svgContainer = container.append('div')
                 .classed('svg-container', true)
                 .classed('remote-container', this.isRemote);
-                
+
             svg = svgContainer.append('svg:svg');
 
             svg.attr('id', this.name)
@@ -458,7 +458,7 @@ define(['d3'], function () {
                 preventOverlap(commit, this);
             }
         },
-        
+
         _resizeSvg: function() {
             var ele = document.getElementById(this.svg.node().id);
             var container = ele.parentNode;
@@ -767,8 +767,8 @@ define(['d3'], function () {
             newTags.append('svg:text')
                 .text(function (d) {
                     if (d.name.indexOf('[') === 0 && d.name.indexOf(']') === d.name.length - 1)
-                        return d.name.substring(1, d.name.length - 1); 
-                    return d.name; 
+                        return d.name.substring(1, d.name.length - 1);
+                    return d.name;
                 })
                 .attr('y', function (d) {
                     return tagY(d, view) + 14;
@@ -1010,9 +1010,9 @@ define(['d3'], function () {
                 while (branchStartCommit.parent !== currentCommit.id) {
                     branchStartCommit = this.getCommit(branchStartCommit.parent);
                 }
-                
+
                 branchStartCommit.isNoFFBranch = true;
-                
+
                 this.commit({parent2: mergeTarget.id, isNoFFCommit: true});
             } else if (this.isAncestor(currentCommit, mergeTarget)) {
                 this.fastForward(mergeTarget);

js/main.js

@@ -52,4 +52,4 @@ require.config({
             exports: 'd3'
         }
     }
-});
+});

memtest.html

@@ -41,4 +41,4 @@ <h3><a id="start-test" href="#">Start Test</a></h3>
 </script>
 <h3><a href="index.html">Back to Home</a></h3>
 </body>
-</html>
+</html>