kallithea Changeset - 0253b8e7d76c

Changeset - 0253b8e7d76c

Parent rev.

Child rev.

[Not reviewed]

default

0 9 0

Mads Kiilerich - 11 years ago 2014-09-08 13:38:56
madski@unity3d.com

templates: replace some YUD with jQuery when we test and test it anyway

9 files changed with 20 insertions and 14 deletions:

kallithea/templates/admin/admin_log.html

kallithea/templates/admin/settings/settings_system.html

kallithea/templates/base/base.html

kallithea/templates/changelog/changelog_summary_data.html

kallithea/templates/files/files.html

kallithea/templates/followers/followers_data.html

kallithea/templates/forks/forks_data.html

kallithea/templates/journal/journal_data.html

kallithea/templates/pullrequests/pullrequest_show_my.html

0 comments (0 inline, 0 general)

kallithea/templates/admin/admin_log.html

➞

Show inline comments

@@ @@ -30,25 +30,26 @@ @@
               ${l.repository_name}
             %endif
         </td>
         <td>${h.fmt_date(l.action_date)}</td>
         <td>${l.user_ip}</td>
     </tr>
     %endfor
 </table>
 <script type="text/javascript">
   $(document).ready(function(){
     $('#user_log').on('click','.pager_link',function(e){
     var $user_log = $('#user_log');
     $user_log.on('click','.pager_link',function(e){
       ypjax(e.target.href,"user_log",function(){
         show_more_event();
         tooltip_activate();
         show_changeset_tooltip();
       });
       e.preventDefault();
     });
     $('#user_log').on('click','.show_more',function(e){
       var el = e.target;
       $('#'+el.id.substring(1)).show();
       $(el.parentNode).hide();
     });

kallithea/templates/admin/settings/settings_system.html

➞

Show inline comments

@@ @@ -27,17 +27,18 @@ @@
   <tbody>
       %for key, value in c.modules:
           <tr>
               <td style="padding-right:5px;">${key}</td>
               <td>${value}</td>
           </tr>
       %endfor
   </tbody>
 </table>
 <script>
     $('#check_for_update').click(function(e){
         $('#update_notice').show();
         var $update_notice = $('#update_notice');
         $update_notice.show();
         ypjax("${h.url('admin_settings_system_update')}",
               "update_notice");
     })
 </script>

kallithea/templates/base/base.html

➞

Show inline comments

@@ @@ -199,27 +199,28 @@ @@
         </li>
         <li ${is_current('showpullrequest')}>
           <a href="${h.url('pullrequest_show_all',repo_name=c.repo_name)}" title="${_('Show Pull Requests for %s') % c.repo_name}"> <i class="icon-code-fork"></i> ${_('Pull Requests')}
             %if c.repository_pull_requests:
               <span>${c.repository_pull_requests}</span>
             %endif
           </a>
         </li>
       </ul>
   </div>
   <script type="text/javascript">
       YUE.on('branch_tag_switcher_2','mouseover',function(){
          var loaded = YUD.hasClass('branch_tag_switcher_2','loaded');
          var $branch_tag_switcher_2 = $('#branch_tag_switcher_2');
          var loaded = $branch_tag_switcher_2.hasClass('loaded');
          if(!loaded){
-             YUD.addClass('branch_tag_switcher_2','loaded');
+             $branch_tag_switcher_2.addClass('loaded');
              ypjax("${h.url('branch_tag_switcher',repo_name=c.repo_name)}",'switch_to_list_2');
+         }
          return false;
       });
   </script>
   <!--- END CONTEXT BAR -->
 </%def>
 <%def name="menu(current=None)">
   <%
   def is_current(selected):
       if selected == current:

kallithea/templates/changelog/changelog_summary_data.html

➞

Show inline comments

@@ @@ -61,25 +61,26 @@ @@
              <div class="branchtag" title="${_('Branch %s' % cs.branch)}">
                  ${h.link_to(cs.branch,h.url('changelog_home',repo_name=c.repo_name,branch=cs.branch))}
              </div>
             %endif
         </td>
     </tr>
 %endfor
 </table>
 <script type="text/javascript">
   $(document).ready(function(){
     $('#shortlog_data').on('click','.pager_link',function(e){
     var $shortlog_data = $('#shortlog_data');
     $shortlog_data.on('click','.pager_link',function(e){
       ypjax(e.target.href,"shortlog_data",function(){tooltip_activate();});
       e.preventDefault();
     });
   });
 </script>
 <div class="pagination-wh pagination-left">
 ${c.repo_changesets.pager('$link_previous ~2~ $link_next')}
 </div>
 %else:
 %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):

kallithea/templates/files/files.html

➞

Show inline comments

@@ @@ -189,38 +189,36 @@ var callbacks = function(State){ @@
             url: pyroutes.url('files_authors_home', {'revision': _rev, 'f_path': _f_path}),
             success: function(data) {
                 $('#file_authors').html(data);
                 $('#file_authors').show();
                 tooltip_activate()
+            }
         })
     })
+}
 $(document).ready(function(){
     ypjax_links();
     var container = 'files_data';
     var $files_data = $('#files_data');
     //Bind to StateChange Event
     History.Adapter.bind(window,'statechange',function(){
         var State = History.getState();
         cache_key = State.url;
         //check if we have this request in cache maybe ?
         var _cache_obj = CACHE[cache_key];
         var _cur_time = new Date().getTime();
         // get from cache if it's there and not yet expired !
         if(_cache_obj !== undefined && _cache_obj[0] > _cur_time){
             YUD.get(container).innerHTML=_cache_obj[1];
             YUD.setStyle(container,'opacity','1.0');
             $files_data.html(_cache_obj[1]);
             $files_data.css('opacity','1.0');
             //callbacks after ypjax call
             callbacks(State);
+        }
         else{
             ypjax(State.url, container, function(){
                     callbacks(State);
                     var expire_on = new Date().getTime() + CACHE_EXPIRE;
                     CACHE[cache_key] = [expire_on, $files_data.html()];
                 });
+        }
     });

kallithea/templates/followers/followers_data.html

➞

Show inline comments

@@ @@ -9,24 +9,25 @@ @@
             <span style="font-size: 20px"> <b>${f.user.username}</b> (${f.user.name} ${f.user.lastname})</span>
         </div>
         <div style="clear:both;padding-top: 10px"></div>
         <div class="follower_date">${_('Started following -')}
         <span class="tooltip" title="${h.tooltip(f.follows_from)}"> ${h.age(f.follows_from)}</span></div>
         <div style="border-bottom: 1px solid #DDD;margin:10px 0px 10px 0px"></div>
     </div>
 % endfor
 <div class="pagination-wh pagination-left">
 <script type="text/javascript">
 $(document).ready(function(){
     $('#followers').on('click','.pager_link',function(e){
     var $followers = $('#followers');
     $followers.on('click','.pager_link',function(e){
         ypjax(e.target.href,"followers",function(){
             show_more_event();
             tooltip_activate();
             show_changeset_tooltip();
         });
         e.preventDefault();
     });
 });
 </script>
 ${c.followers_pager.pager('$link_previous ~2~ $link_next')}
 </div>

kallithea/templates/forks/forks_data.html

➞

Show inline comments

@@ @@ -17,25 +17,26 @@ @@
             <div class="follower_date">${_('Forked')} -
                 <span class="tooltip" title="${h.tooltip(h.fmt_date(f.created_on))}"> ${h.age(f.created_on)}</span>
                 <a title="${_('Compare fork with %s' % c.repo_name)}"
                    href="${h.url('compare_url',repo_name=c.repo_name, org_ref_type=c.db_repo.landing_rev[0],org_ref_name=c.db_repo.landing_rev[1],other_repo=f.repo_name,other_ref_type=c.db_repo.landing_rev[0],other_ref_name=c.db_repo.landing_rev[1], merge=1)}"
                    class="btn btn-small"><i class="icon-loop"></i> ${_('Compare fork')}</a>
             </div>
             <div style="border-bottom: 1px solid #DDD;margin:10px 0px 10px 0px"></div>
         </div>
     % endfor
   <div class="pagination-wh pagination-left">
   <script type="text/javascript">
   $(document).ready(function(){
       $('#forks').on('click','.pager_link',function(e){
       var $forks = $('#forks');
       $forks.on('click','.pager_link',function(e){
           ypjax(e.target.href,"forks",function(){
               show_more_event();
               tooltip_activate();
               show_changeset_tooltip();
           });
           e.preventDefault();
       });
   });
   </script>
   ${c.forks_pager.pager('$link_previous ~2~ $link_next')}
   </div>
 % else:

kallithea/templates/journal/journal_data.html

➞

Show inline comments

@@ @@ -31,25 +31,26 @@ @@
                     <div class="date"><span class="tooltip" title="${h.tooltip(h.fmt_date(entry.action_date))}">${h.age(entry.action_date)}</span></div>
                 %endfor
                 </div>
             </div>
         %endfor
     %endfor
   <div class="pagination-wh pagination-left" style="padding: 0px 0px 0px 10px;">
   ${c.journal_pager.pager('$link_previous ~2~ $link_next')}
   </div>
     <script type="text/javascript">
     $(document).ready(function(){
         $('#journal').on('click','.pager_link',function(e){
         var $journal = $('#journal');
         $journal.on('click','.pager_link',function(e){
             ypjax(e.target.href,"journal",function(){
                 show_more_event();
                 tooltip_activate();
                 show_changeset_tooltip();
             });
             e.preventDefault();
         });
         $('#journal').on('click','.show_more',function(e){
             var el = e.target;
             $('#'+el.id.substring(1)).show();
             $(el.parentNode).hide();
         });

kallithea/templates/pullrequests/pullrequest_show_my.html

➞

Show inline comments

@@ @@ -22,28 +22,29 @@ @@
     <div id="pullrequests_container" class="table">
         ## loaded via AJAX
         ${_('Loading...')}
     </div>
 <script type="text/javascript">
 pyroutes.register('my_pullrequests_data', "${url('my_pullrequests_data')}", []);
 var show_pullrequests = function(e){
     var url = pyroutes.url('my_pullrequests_data');
-    if(YUD.get('show_closed') && YUD.get('show_closed').checked) {
+    if ($('#show_closed').prop('checked')) {
         var url = pyroutes.url('my_pullrequests_data', {'pr_show_closed': '1'});
+    }
     ypjax(url, 'pullrequests_container', function(){
         YUE.on('show_closed','change',function (e) {
         // new #show_closed has just been loaded
         $('#show_closed').change(function (e) {
             show_pullrequests(e);
         });
     });
+}
 show_pullrequests()
 </script>
 </div>
 </%def>

0 comments (0 inline, 0 general)