# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2018-11-02 08:27:06
# Node ID d9b9ddddd83caaf48e7a66d3a14d166636e4c32d
# Parent  3a350ddc10a32e6491b160a71b7803caee75fa33

commits: unified expand commit logic and UI.

- also added cursor for whole clickable element not just the arrow.

diff --git a/rhodecode/public/css/main.less b/rhodecode/public/css/main.less
--- a/rhodecode/public/css/main.less
+++ b/rhodecode/public/css/main.less
@@ -623,11 +623,6 @@ input::-moz-focus-inner { border:0; padd
 	display: block;
 }
 
-//TODO: lisa: this should be in tables
-.show_more_col {
-    width: 20px;
-}
-
 //FORMS
 
 .medium-inline,
diff --git a/rhodecode/public/css/tables.less b/rhodecode/public/css/tables.less
--- a/rhodecode/public/css/tables.less
+++ b/rhodecode/public/css/tables.less
@@ -230,6 +230,8 @@ table.dataTable {
         &.expand_commit {
             padding-right: 0;
             padding-left: 1em;
+            cursor: pointer;
+            width: 20px;
         }
     }
 
@@ -445,6 +447,8 @@ table.trending_language_tbl {
 
         &.expand_commit {
             padding-right: 0;
+            cursor: pointer;
+            width: 20px;
         }
     }
 }
diff --git a/rhodecode/public/js/src/rhodecode/changelog.js b/rhodecode/public/js/src/rhodecode/changelog.js
--- a/rhodecode/public/js/src/rhodecode/changelog.js
+++ b/rhodecode/public/js/src/rhodecode/changelog.js
@@ -142,7 +142,8 @@ var CommitsController = function () {
         })
     };
 
-    this.expandCommit = function (node) {
+    this.expandCommit = function (node, reloadGraph) {
+        reloadGraph = reloadGraph || false;
 
         var target_expand = $(node);
         var cid = target_expand.data('commitId');
@@ -179,7 +180,10 @@ var CommitsController = function () {
             });
             target_expand.addClass('open');
         }
-        // redraw the graph
-        self.reloadGraph();
+
+        if (reloadGraph) {
+            // redraw the graph
+            self.reloadGraph();
+        }
     }
 };
diff --git a/rhodecode/templates/changelog/changelog_elements.mako b/rhodecode/templates/changelog/changelog_elements.mako
--- a/rhodecode/templates/changelog/changelog_elements.mako
+++ b/rhodecode/templates/changelog/changelog_elements.mako
@@ -1,7 +1,6 @@
 ## small box that displays changed/added/removed details fetched by AJAX
 <%namespace name="base" file="/base/base.mako"/>
 
-
 % if c.prev_page:
     <tr>
         <td colspan="9" class="load-more-commits">
@@ -80,14 +79,12 @@
           % endif
       % endif
     </td>
-    <td class="td-message expand_commit" data-commit-id="${commit.raw_id}" title="${_('Expand commit message')}" onclick="commitsController.expandCommit(this); return false">
-      <div class="show_more_col">
+    <td class="td-message expand_commit" data-commit-id="${commit.raw_id}" title="${_('Expand commit message')}" onclick="commitsController.expandCommit(this, true); return false">
         <i class="icon-expand-linked"></i>&nbsp;
-      </div>
     </td>
     <td class="td-description mid">
       <div class="log-container truncate-wrap">
-          <div class="message truncate" id="c-${commit.raw_id}">${urlify_commit_message(commit.message, c.repo_name)}</div>
+          <div class="message truncate" id="c-${commit.raw_id}" data-message-raw="${commit.message}">${urlify_commit_message(commit.message, c.repo_name)}</div>
       </div>
     </td>
 
diff --git a/rhodecode/templates/compare/compare_commits.mako b/rhodecode/templates/compare/compare_commits.mako
--- a/rhodecode/templates/compare/compare_commits.mako
+++ b/rhodecode/templates/compare/compare_commits.mako
@@ -45,23 +45,12 @@
                     ${h.hidden('revisions',commit.raw_id)}
                 </code>
             </td>
-            <td class="expand_commit"
-                data-commit-id="${commit.raw_id}"
-                title="${_( 'Expand commit message')}"
-            >
-                <div class="show_more_col">
+            <td class="td-message expand_commit" data-commit-id="${commit.raw_id}" title="${_('Expand commit message')}" onclick="commitsController.expandCommit(this); return false">
                 <i class="icon-expand-linked"></i>
-                </div>
             </td>
             <td class="mid td-description">
                 <div class="log-container truncate-wrap">
-                    <div
-                        id="c-${commit.raw_id}"
-                        class="message truncate"
-                        data-message-raw="${commit.message}"
-                    >
-                        ${urlify_commit_message(commit.message, c.repo_name)}
-                    </div>
+                    <div class="message truncate" id="c-${commit.raw_id}" data-message-raw="${commit.message}">${urlify_commit_message(commit.message, c.repo_name)}</div>
                 </div>
             </td>
         </tr>
@@ -85,31 +74,7 @@
 </div>
 
 <script>
-$('.expand_commit').on('click',function(e){
-  var target_expand = $(this);
-  var cid = target_expand.data('commitId');
-
-  // ## TODO: dan: extract styles into css, and just toggleClass('open') here
-  if (target_expand.hasClass('open')){
-    $('#c-'+cid).css({
-        'height': '1.5em',
-        'white-space': 'nowrap',
-        'text-overflow': 'ellipsis',
-        'overflow':'hidden'
-    });
-    target_expand.removeClass('open');
-  }
-  else {
-    $('#c-'+cid).css({
-        'height': 'auto',
-        'white-space': 'pre-line',
-        'text-overflow': 'initial',
-        'overflow':'visible'
-    });
-    target_expand.addClass('open');
-  }
-});
-
+commitsController = new CommitsController();
 $('.compare_select').on('click',function(e){
     var cid = $(this).attr('commit_id');
     $('#row-'+cid).toggleClass('hl', !$('#row-'+cid).hasClass('hl'));
diff --git a/rhodecode/templates/pullrequests/pullrequest_show.mako b/rhodecode/templates/pullrequests/pullrequest_show.mako
--- a/rhodecode/templates/pullrequests/pullrequest_show.mako
+++ b/rhodecode/templates/pullrequests/pullrequest_show.mako
@@ -516,16 +516,12 @@
                                         ${h.hidden('revisions', commit.raw_id)}
                                     </code>
                                 </td>
-                                <td class="expand_commit" data-commit-id="${commit.raw_id}" title="${_( 'Expand commit message')}">
-                                    <div class="show_more_col">
+                                <td class="td-message expand_commit" data-commit-id="${commit.raw_id}" title="${_( 'Expand commit message')}" onclick="commitsController.expandCommit(this); return false">
                                     <i class="icon-expand-linked"></i>
-                                    </div>
                                 </td>
                                 <td class="mid td-description">
                                     <div class="log-container truncate-wrap">
-                                        <div class="message truncate" id="c-${commit.raw_id}" data-message-raw="${commit.message}">
-                                            ${h.urlify_commit_message(commit.message, c.repo_name)}
-                                        </div>
+                                        <div class="message truncate" id="c-${commit.raw_id}" data-message-raw="${commit.message}">${h.urlify_commit_message(commit.message, c.repo_name)}</div>
                                     </div>
                                 </td>
                             </tr>
@@ -534,32 +530,6 @@
                         </table>
                     </div>
 
-                    <script>
-                    $('.expand_commit').on('click',function(e){
-                      var target_expand = $(this);
-                      var cid = target_expand.data('commitId');
-
-                      if (target_expand.hasClass('open')){
-                        $('#c-'+cid).css({
-                            'height': '1.5em',
-                            'white-space': 'nowrap',
-                            'text-overflow': 'ellipsis',
-                            'overflow':'hidden'
-                        });
-                        target_expand.removeClass('open');
-                      }
-                      else {
-                        $('#c-'+cid).css({
-                            'height': 'auto',
-                            'white-space': 'pre-line',
-                            'text-overflow': 'initial',
-                            'overflow':'visible'
-                        });
-                        target_expand.addClass('open');
-                      }
-                    });
-                    </script>
-
                     % endif
 
                 % else:
@@ -656,6 +626,7 @@
         versionController.init();
 
         reviewersController = new ReviewersController();
+        commitsController = new CommitsController();
 
         $(function(){
 
diff --git a/rhodecode/templates/search/search_commit.mako b/rhodecode/templates/search/search_commit.mako
--- a/rhodecode/templates/search/search_commit.mako
+++ b/rhodecode/templates/search/search_commit.mako
@@ -34,7 +34,7 @@
                       h.route_path('repo_commit',repo_name=entry['repository'],commit_id=entry['commit_id']))}
                 </td>
                 <td class="td-message expand_commit search open" data-commit-id="${h.md5_safe(entry['repository'])+entry['commit_id']}" id="t-${h.md5_safe(entry['repository'])+entry['commit_id']}" title="${_('Expand commit message')}">
-                    <div class="show_more_col">
+                    <div>
                     <i class="icon-expand-linked"></i>&nbsp;
                     </div>
                 </td>