zitgit 0.0.2 → 0.1.0

data/public/js/application.js

@@ -1,13 +1,32 @@
 (function() {
-  var ChangeCommit, SetHeight, UpdateDiffsWidth;
+  var ChangeBranch, ChangeCommit, CommitArrows, LoadStatus, RefreshContent, RefreshStatus, SelectDiff, SelectRow, SetHeight, SwitchBranch, TableArrows, UpdateDiffsWidth;
 
   ChangeCommit = function($commit) {
     var $target_commit;
 
     $target_commit = $commit.clone();
     $('.commits-table tr.selected').removeClass('selected');
+    $('.status').removeClass('selected');
     $commit.parents('tr').addClass('selected');
     $('.show_commit').html($target_commit);
+    $('.show_commit .diffs li').niceScroll({
+      cursorcolor: '#ccc',
+      cursorwidth: 14
+    });
+    return UpdateDiffsWidth();
+  };
+
+  LoadStatus = function() {
+    var $status_content;
+
+    $('.commits-table tr.selected').removeClass('selected');
+    $('.status').addClass('selected');
+    $status_content = $('.status .status_content').clone();
+    $('.show_commit').html($status_content);
+    $('.show_commit .diffs li').niceScroll({
+      cursorcolor: '#ccc',
+      cursorwidth: 14
+    });
     return UpdateDiffsWidth();
   };
 
@@ -26,31 +45,178 @@
     });
   };
 
-  $(function() {
+  SelectDiff = function($diff) {
+    var index;
+
+    $('.show_commit .diff-names .selected').removeClass('selected');
+    $diff.addClass('selected');
+    if ($diff.hasClass('all')) {
+      return $('.show_commit .diffs li').removeClass('hidden');
+    } else {
+      index = $diff.index() - 1;
+      $('.show_commit .diffs li').addClass('hidden');
+      return $('.show_commit .diffs li:eq(' + index + ')').removeClass('hidden');
+    }
+  };
+
+  ChangeBranch = function($link) {
+    var timeout;
+
+    timeout = setTimeout(function() {
+      $('.loader').show();
+      return $('.main').hide();
+    }, 1500);
+    return $.get($link.attr('href'), function(data) {
+      var list_class;
+
+      clearTimeout(timeout);
+      $('.loader').hide();
+      $('.current_branch').text('');
+      if ($link.parents('.ref_label').length) {
+        list_class = $link.parents('.ref_label').attr('data-dropdown-name');
+        $('.dropdown.' + list_class + '').parent('.has-dropdown').find('.current_branch').text($link.text());
+      } else {
+        $link.parents('.has-dropdown').find('.current_branch').text($link.text());
+      }
+      $('.commits-table').replaceWith(data);
+      $('.main').show();
+      return ChangeCommit($('.commits-table tbody tr:first .commit'));
+    });
+  };
+
+  SwitchBranch = function() {
     $('.top-bar .dropdown li a').on('click', function(e) {
-      var $link, timeout;
+      e.preventDefault();
+      return ChangeBranch($(this));
+    });
+    return $('body').on('click', '.ref_label a', function(e) {
+      e.preventDefault();
+      return ChangeBranch($(this));
+    });
+  };
+
+  RefreshStatus = function() {
+    return $.get('/status/', function(data) {
+      return $('.status').replaceWith(data);
+    });
+  };
+
+  RefreshContent = function() {
+    RefreshStatus();
+    return $('.current_branch').each(function(index) {
+      var branch_name;
+
+      if ($(this).text() !== '') {
+        branch_name = $(this).text();
+        $(this).parent('.has-dropdown').find('.dropdown li a').each(function(index) {
+          if ($(this).text() === branch_name) {
+            ChangeBranch($(this));
+            return false;
+          }
+        });
+        return false;
+      }
+    });
+  };
+
+  SelectRow = function($row) {
+    var current_scroll, offset;
 
+    if ($row.offset().top < $('.history').offset().top) {
+      current_scroll = $('.history').scrollTop();
+      $('.history').scrollTop(current_scroll + $row.offset().top - $('.history').offset().top);
+    }
+    offset = $row.offset().top - $('.history').offset().top;
+    if (offset + $row.outerHeight() > $('.history').outerHeight()) {
+      current_scroll = $('.history').scrollTop();
+      $('.history').scrollTop(current_scroll + offset + $row.outerHeight() - $('.history').outerHeight());
+    }
+    return ChangeCommit($row.find('.commit'));
+  };
+
+  TableArrows = function() {
+    var motions;
+
+    motions = [38, 40, 33, 34, 35, 36];
+    return $('.history').on('keydown', function(e) {
+      var $next, $next_rows;
+
+      if (motions.indexOf(e.keyCode) === -1) {
+        return;
+      }
       e.preventDefault();
-      $link = $(this);
-      timeout = setTimeout(function() {
-        $('.loader').show();
-        return $('.main').hide();
-      }, 1500);
-      return $.get($link.attr('href'), function(data) {
-        clearTimeout(timeout);
-        $('.loader').hide();
-        $('.current_branch').text('');
-        $link.parents('.has-dropdown').find('.current_branch').text($link.text());
-        $('.commits-table').replaceWith(data);
-        $('.main').show();
-        return ChangeCommit($('.commits-table tbody tr:first .commit'));
-      });
+      e.stopPropagation();
+      if (e.keyCode === 38) {
+        $next = $('.commits-table tr.selected').prev();
+      } else if (e.keyCode === 40) {
+        $next = $('.commits-table tr.selected').next();
+      } else if (e.keyCode === 33) {
+        $next_rows = $('.commits-table tr.selected').prevAll();
+        if ($next_rows.length >= 10) {
+          $next = $next_rows.eq(9);
+        } else {
+          $next = $next_rows.last();
+        }
+      } else if (e.keyCode === 34) {
+        $next_rows = $('.commits-table tr.selected').nextAll();
+        if ($next_rows.length >= 10) {
+          $next = $next_rows.eq(9);
+        } else {
+          $next = $next_rows.last();
+        }
+      } else if (e.keyCode === 36) {
+        $next = $('.commits-table tbody tr:first');
+      } else if (e.keyCode === 35) {
+        $next = $('.commits-table tr:last');
+      }
+      if ($next && $next.length > 0) {
+        return SelectRow($next);
+      }
     });
+  };
+
+  CommitArrows = function() {
+    var motions;
+
+    motions = [38, 40];
+    return $('.show_commit').on('keydown', function(e) {
+      var $next;
+
+      if (motions.indexOf(e.keyCode) === -1) {
+        return;
+      }
+      e.preventDefault();
+      e.stopPropagation();
+      if (e.keyCode === 38) {
+        $next = $('.show_commit .diff-names li.selected').prev();
+      } else if (e.keyCode === 40) {
+        $next = $('.show_commit .diff-names li.selected').next();
+      }
+      if ($next && $next.length > 0) {
+        return SelectDiff($next);
+      }
+    });
+  };
+
+  $(function() {
     $('.history').on('click', '.commits-table tr', function(e) {
       return ChangeCommit($(this).find('.commit'));
     });
-    UpdateDiffsWidth();
+    $('.history').on('click', '.status-link', function(e) {
+      e.preventDefault();
+      return LoadStatus();
+    });
+    $('.refresh').on('click', function(e) {
+      e.preventDefault();
+      return RefreshContent();
+    });
+    $('.show_commit').on('click', '.diff-names li', function(e) {
+      return SelectDiff($(this));
+    });
+    SwitchBranch();
     SetHeight();
+    TableArrows();
+    CommitArrows();
     $(window).resize(function() {
       return SetHeight();
     });
@@ -64,10 +230,11 @@
       railalign: 'left',
       horizrailenabled: false
     });
-    return $('.diffs li').niceScroll({
+    $('.show_commit .diffs li').niceScroll({
       cursorcolor: '#ccc',
       cursorwidth: 14
     });
+    return UpdateDiffsWidth();
   });
 
 }).call(this);

data/public/scss/app.scss

@@ -2,8 +2,14 @@
 
 .top-bar {
     z-index: 6;
+    .refresh{
+        img{
+            position: relative;
+            top: 8px;
+        }
+    }
 }
-.row .history.columns{
+.main .history.columns{
     padding: 0 0 0 15px;
 }
 .ref_label{
@@ -12,15 +18,30 @@
     border-radius: 12px;
     padding: 2px 4px;
     float: left;
+    a{
+        color: #000;
+    }
 }
 .branch_label{
-    background: yellow;
+    background: #ffeeee;
+    border-color: #581313;
+    a{
+        color: #581313;
+    }
 }
 .remote_label{
-    background: red;
+    background: #ffe3e3;
+    border-color: #b32222;
+    a{
+        color: #b32222;
+    }
 }
 .tag_label{
-    background: #e77a1c;
+    background: #ffe6bc;
+    border-color: #ff9800;
+    a{
+        color: #ff9800;
+    }
 }
 .commits-table{
     thead{
@@ -44,11 +65,22 @@
             font-size: 12px;
             border-radius: 8px;
             padding: 0 2px;
+            max-width: 134px;
+            word-wrap: break-word;
+            text-align: center;
+        }
+        .sha{
+            font-size:10px;
         }
     }
     .author{
         width: 180px;
     }
+    .message{
+        div{
+            max-height: 56px;
+        }
+    }
     tbody{
         tr.selected{
             background: #c3e2ff;
@@ -75,7 +107,8 @@
     padding-top: 14px;
     list-style-type: none;
     li{
-        margin-bottom: -8px;
+        margin-bottom: -4px;
+        padding: 0 4px;
         .new_file{
             color: green;
         }
@@ -83,10 +116,14 @@
             color: red;
         }
     }
+    .selected{
+        background: #a7d5ff;
+    }
 }
 .diffs{
     background: #fff;
     list-style-type: none;
+    font-family: monospace;
     li{
         border-bottom: solid #ddd 8px;
         overflow-x: scroll;        
@@ -96,16 +133,19 @@
         }
         .diff-first-line{
             font-weight: bold;
-            background: #A7B5FF;
-            border-bottom: 1px solid black;
+            background: #eee;
+            border-bottom: 1px solid #777;
         }
         .diff-summ-line{
-            background: #A7B5FF;
+            background: #eee;
             font-weight: bold;
         }
         .diff-added-line{
             color: #096707;            
             background: #87f49f;
+            .trailing{
+                background: #036420;
+            }
         }
         .diff-removed-line{
             position: relative;
@@ -113,8 +153,14 @@
             right: 0;
             color: #742b2b;
             background: #ffb1cb;
+            .trailing{
+                background: #c10000;
+            }
         }
     }
+    img{
+        display: block;
+    }
 }
 .hidden{
     display: none;
@@ -126,23 +172,36 @@
         background: #ddd;
         border-radius: 16px;
         .author_info{
-            /*width: 50%;*/
             float: left;
             font-weight: bold;
+            clear: left;
+            color: #eee;
+            text-shadow: 1px 1px 0px #333, 1px -1px 0px #333, -1px 1px 0px #333, -1px -1px 0px #333; 
         }
         .commit_sha{
             margin-bottom:14px;
-            margin-top: -14px;
             clear: left;
+            float: left;
+        }
+        .commit_date{
+            margin-bottom:14px;
+            float: right;
         }
         .stats{
             float: right;
+            text-align: right;
             .additions{
                 color: green;
             }
             .deletions{
                 color: red;
             }
+            .merge_commit{
+                font-weight: bold;
+                position: relative;
+                top: 8px;
+                color: #0300ff;
+            }
         }
     }
 }
@@ -153,3 +212,24 @@
     background: url('/images/loader.gif') no-repeat;
     display: none;
 }
+.status{
+    margin-bottom: 8px;
+    padding: 4px 0;
+    .status_content{
+        display: none;
+    }
+    .status-link{
+        display: block;
+        font-weight: bold;
+        color: #000;
+        padding-left: 16px;
+        font-size: 20px;
+    }
+    &.selected{
+        background: #c3e2ff;
+        border-bottom: 2px solid #78c3ff;
+        border-top: 2px solid #78c3ff;
+        border-left: 1px solid #78c3ff;
+        border-right: 1px solid #78c3ff;
+    }
+}

data/views/commits/detail.slim

@@ -1,12 +1,22 @@
 .commit
-  h4=commit.message
+  h4=strip_message(commit.message, 120)
   == slim :'commits/labels', :locals => {commit: commit}, :layout => false
   .commit_sha =commit.sha
+  .commit_date =commit.date.strftime("%d.%m.%Y %H:%M")
   .author_info
     div = commit.author.name
     div = commit.author.email
   .stats
-    div.additions = "#{ commit.stats.additions } additions"
-    div.deletions = "#{ commit.stats.deletions } deletions"
+    - if merge_commit?(commit)
+      div.merge_commit merge
+    -else
+      div.additions = "#{ commit.stats.additions } additions"
+      div.deletions = "#{ commit.stats.deletions } deletions"
 
-  == slim :'diffs/list', :locals => {diffs: commit.diffs}, :layout => false
+  - if large_commit?(commit)
+    .diff-names
+      .large
+        =' commit.diffs.count
+        | files changed
+  - else 
+    == slim(:'diffs/list', :locals => {diffs: commit.diffs}, :layout => false).force_encoding('utf-8')