Gitx GitX → 0.8

Comments and changes to this ticket

• 

  Johannes Gilger September 11th, 2010 @ 07:16 PM

  • Milestone set to “0.8”
  • State changed from “new” to “small”
  • Assigned user changed from “Pieter de Bie” to “Johannes Gilger”
  • Milestone order changed from “32831” to “0”

  I can confirm this in Nathan's experimental is. The problem is that the list of files is appended, while the actual diff is redrawn when 'showDiff' is called.

  I wrote a one-liner which simply clears the list of files as well, so 'v' acts as refresh-button for the diff. This is the easiest way to get desired behavior. Having an extra-variable for checking whether 'v' was already pressed seems overly complicated to me.

  Will queue it for 0.8.

• 

  Kelan Champagne September 11th, 2010 @ 07:48 PM

  Yeah, I made a simple fix locally too. It aborts from highlightDiff() if it's already been run, which it determines based on the .className of the target element. In order for this to work, also reset the .className of the "diff" div at the top of loadCommit().

  Here is the diff:

  diff --git a/html/lib/diffHighlighter.js b/html/lib/diffHighlighter.js
  index cda95a8..f18e0e1 100644
  --- a/html/lib/diffHighlighter.js
  +++ b/html/lib/diffHighlighter.js
  @@ -10,6 +10,10 @@ var highlightDiff = function(diff, element, callbacks) {
      if (!diff || diff == "")
          return;
  
  +   // Don't run twice.
  +   if (element.className == "diff")
  +       return;
  +
      if (!callbacks)
          callbacks = {};
      var start = new Date().getTime();
  diff --git a/html/views/history/history.js b/html/views/history/history.js
  index 6cd7540..ca34cf4 100644
  --- a/html/views/history/history.js
  +++ b/html/views/history/history.js
  @@ -179,6 +179,7 @@ var loadCommit = function(commitObject, currentRef) {
      $("authorID").innerHTML = commit.author_name;
      $("subjectID").innerHTML = commit.subject.escapeHTML();
      $("diff").innerHTML = ""
  +   $("diff").className = "";
      $("message").innerHTML = ""
      $("files").innerHTML = ""
      $("date").innerHTML = ""