kallithea Changeset - d2b9788d2760

Changeset - d2b9788d2760

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Mads Kiilerich - 10 years ago 2015-08-26 17:28:58
madski@unity3d.com

follow: various minor cleanup

A debug session gave no other result than this +0.1 cleanup ...

3 files changed with 11 insertions and 19 deletions:

kallithea/public/js/base.js

kallithea/templates/base/base.html

kallithea/templates/data_table/_dt_elements.html

0 comments (0 inline, 0 general)

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -439,18 +439,17 @@ var show_changeset_tooltip = function(){ @@
 var _onSuccessFollow = function(target){
     var $target = $(target);
     var $f_cnt = $('#current_followers_count');
     if($target.hasClass('follow')){
         $target.attr('class', 'following');
         $target.attr('title', _TM['Stop following this repository']);
         if($f_cnt.html()){
     if ($target.hasClass('follow')) {
         $target.removeClass('follow').addClass('following');
         $target.prop('title', _TM['Stop following this repository']);
         if ($f_cnt.html()) {
             var cnt = Number($f_cnt.html())+1;
             $f_cnt.html(cnt);
+        }
+    }
     else{
         $target.attr('class', 'follow');
         $target.attr('title', _TM['Start following this repository']);
         if($f_cnt.html()){
     } else {
         $target.removeClass('following').addClass('follow');
         $target.prop('title', _TM['Start following this repository']);
         if ($f_cnt.html()) {
             var cnt = Number($f_cnt.html())-1;
             $f_cnt.html(cnt);
+        }

kallithea/templates/base/base.html

➞

Show inline comments

@@ @@ -97,13 +97,6 @@ @@
 <%def name="repo_context_bar(current=None, rev=None)">
   <% rev = None if rev == 'tip' else rev %>
   <%
       def follow_class():
           if c.repository_following:
               return h.literal('following')
           else:
               return h.literal('follow')
   %>
   <%
     def is_current(selected):
         if selected == current:
             return h.literal('class="current"')
@@ @@ -176,10 +169,10 @@ @@
               ## also it feels like a job for the controller
               %if c.authuser.username != 'default':
                   <li>
-                   <a class="${follow_class()}" onclick="javascript:toggleFollowingRepo(this,${c.db_repo.repo_id});">
+                   <a class="${'following' if c.repository_following else 'follow'}" onclick="toggleFollowingRepo(this, ${c.db_repo.repo_id});">
                     <span class="show-follow"><i class="icon-heart-empty"></i> ${_('Follow')}</span>
                     <span class="show-following"><i class="icon-heart"></i> ${_('Unfollow')}</span>
                   </a>
+                   </a>
                   </li>
                   <li><a href="${h.url('repo_fork_home',repo_name=c.repo_name)}"><i class="icon-git-pull-request"></i> ${_('Fork')}</a></li>
                   <li><a href="${h.url('pullrequest_home',repo_name=c.repo_name)}"><i class="icon-git-pull-request"></i> ${_('Create Pull Request')}</a></li>

kallithea/templates/data_table/_dt_elements.html

➞

Show inline comments

@@ @@ -212,6 +212,6 @@ @@
 <%def name="toggle_follow(repo_id)">
   <span id="follow_toggle_${repo_id}" class="following" title="${_('Stop following this repository')}"
-        onclick="javascript:toggleFollowingRepo(this, ${repo_id})">
         onclick="toggleFollowingRepo(this, ${repo_id})">
   </span>
 </%def>

0 comments (0 inline, 0 general)