kallithea Changeset - 155f281be5f8

Changeset - 155f281be5f8

Parent rev.

Child rev.

[Not reviewed]

default

0 13 0

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

javascript: use jQuery for ypjax and rename to asynchtml

The container id is replaced with a $target jQuery array.

13 files changed with 33 insertions and 52 deletions:

kallithea/public/js/base.js

kallithea/templates/admin/admin_log.html

kallithea/templates/admin/notifications/notifications.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.html

kallithea/templates/journal/journal_data.html

kallithea/templates/pullrequests/pullrequest.html

kallithea/templates/pullrequests/pullrequest_show_my.html

0 comments (0 inline, 0 general)

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -350,57 +350,39 @@ var _toQueryString = function(o) { @@
         _qs.push(encodeURIComponent(_p) + '=' + encodeURIComponent(o[_p]));
+    }
     return _qs.join('&');
 };
 /**
- * Partial Ajax Implementation
+ * Load HTML into DOM using Ajax
+ *
  * @param url: defines url to make partial request
  * @param container: defines id of container to input partial result
  * @param s_call: success callback function that takes o as arg
  *  o.tId
  *  o.status
  *  o.statusText
  *  o.getResponseHeader[ ]
  *  o.getAllResponseHeaders
  *  o.responseText
  *  o.responseXML
  *  o.argument
  * @param args arguments
  * @param $target: load html async and place it (or an error message) here
  * @param success: success callback function
  * @param args: query parameters to pass to url
  */
 function ypjax(url, container, s_call, args){
     var method='GET';
 function asynchtml(url, $target, success, args){
     if(args===undefined){
         args=null;
+    }
     var $target = $('#' + container);
     $target.html(_TM['Loading ...']).css('opacity','0.3');
     // Set special header for partial ajax == HTTP_X_PARTIAL_XHR
     YUC.initHeader('X-PARTIAL-XHR',true);
     // wrapper of passed callback
     var s_wrapper = (function(o){
         return function(o){
             $target.html(o.responseText).css('opacity','1.0');
     $.ajax({url: url, data: args, headers: {'X-PARTIAL-XHR': '1'}, cache: false, dataType: 'html'})
         .done(function(html) {
                 $target.html(html);
                 $target.css('opacity','1.0');
             //execute the given original callback
             if (s_call !== undefined && s_call){
                 s_call();
                 if (success !== undefined && success) {
                     success();
+            }
+        }
     })()
     YUC.asyncRequest(method, url, {
         success: s_wrapper,
         failure: function(o){
             console.log('ypjax failure: '+o);
             $target.html('<span class="error_red">ERROR: {0}</span>'.format(o.status)).css('opacity','1.0');
         },
         cache:false
     },args);
             })
         .fail(function(jqXHR, textStatus, errorThrown) {
                 console.log('Ajax failure: ' + textStatus);
                 $target.html('<span class="error_red">ERROR: {0}</span>'.format(textStatus));
                 $target.css('opacity','1.0');
             })
+        ;
 };
 var ajaxGET = function(url,success) {
     // Set special header for ajax == HTTP_X_PARTIAL_XHR
     YUC.initHeader('X-PARTIAL-XHR',true);

kallithea/templates/admin/admin_log.html

➞

Show inline comments

@@ @@ -38,20 +38,20 @@ @@
 </table>
 <script type="text/javascript">
   $(document).ready(function(){
     var $user_log = $('#user_log');
     $user_log.on('click','.pager_link',function(e){
-      ypjax(e.target.href,"user_log",function(){
+      asynchtml(e.target.href, $user_log, function(){
         show_more_event();
         tooltip_activate();
         show_changeset_tooltip();
       });
       e.preventDefault();
     });
-    $('#user_log').on('click','.show_more',function(e){
     $user_log.on('click','.show_more',function(e){
       var el = e.target;
       $('#'+el.id.substring(1)).show();
       $(el.parentNode).hide();
     });
   });
 </script>

kallithea/templates/admin/notifications/notifications.html

➞

Show inline comments

@@ @@ -49,13 +49,13 @@ var run = function(){ @@
     readNotification(url_action,notification_id);
   });
+}
 run();
 $('#mark_all_read').click(function(){
     var url = "${h.url('notifications_mark_all_read', **request.GET.mixed())}";
-    ypjax(url,'notification_data',function(){run()});
+    asynchtml(url, $('#notification_data'), function(){run();});
 });
 var current_filter = "${c.current_filter}";
 $('#'+current_filter).addClass('active');
 </script>
 </%def>

kallithea/templates/admin/settings/settings_system.html

➞

Show inline comments

@@ @@ -35,10 +35,9 @@ @@
 </table>
 <script>
     $('#check_for_update').click(function(e){
         var $update_notice = $('#update_notice');
         $update_notice.show();
         ypjax("${h.url('admin_settings_system_update')}",
               "update_notice");
     })
         asynchtml("${h.url('admin_settings_system_update')}", $update_notice);
     });
 </script>

kallithea/templates/base/base.html

➞

Show inline comments

@@ @@ -209,13 +209,13 @@ @@
   <script type="text/javascript">
       YUE.on('branch_tag_switcher_2','mouseover',function(){
          var $branch_tag_switcher_2 = $('#branch_tag_switcher_2');
          var loaded = $branch_tag_switcher_2.hasClass('loaded');
          if(!loaded){
              $branch_tag_switcher_2.addClass('loaded');
-             ypjax("${h.url('branch_tag_switcher',repo_name=c.repo_name)}",'switch_to_list_2');
+             asynchtml("${h.url('branch_tag_switcher',repo_name=c.repo_name)}", $('#switch_to_list_2'));
+         }
          return false;
       });
   </script>
   <!--- END CONTEXT BAR -->
 </%def>

kallithea/templates/changelog/changelog_summary_data.html

➞

Show inline comments

@@ @@ -69,13 +69,13 @@ @@
 </table>
 <script type="text/javascript">
   $(document).ready(function(){
     var $shortlog_data = $('#shortlog_data');
     $shortlog_data.on('click','.pager_link',function(e){
-      ypjax(e.target.href,"shortlog_data",function(){tooltip_activate();});
+      asynchtml(e.target.href, $shortlog_data, function(){tooltip_activate();});
       e.preventDefault();
     });
   });
 </script>
 <div class="pagination-wh pagination-left">

kallithea/templates/files/files.html

➞

Show inline comments

@@ @@ -211,13 +211,13 @@ $(document).ready(function(){ @@
             $files_data.html(_cache_obj[1]);
             $files_data.css('opacity','1.0');
             //callbacks after ypjax call
             callbacks(State);
+        }
         else{
-            ypjax(State.url, container, function(){
+            asynchtml(State.url, $files_data, 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

@@ @@ -17,13 +17,13 @@ @@
 <div class="pagination-wh pagination-left">
 <script type="text/javascript">
 $(document).ready(function(){
     var $followers = $('#followers');
     $followers.on('click','.pager_link',function(e){
-        ypjax(e.target.href,"followers",function(){
+        asynchtml(e.target.href, $followers, function(){
             show_more_event();
             tooltip_activate();
             show_changeset_tooltip();
         });
         e.preventDefault();
     });

kallithea/templates/forks/forks_data.html

➞

Show inline comments

@@ @@ -25,13 +25,13 @@ @@
     % endfor
   <div class="pagination-wh pagination-left">
   <script type="text/javascript">
   $(document).ready(function(){
       var $forks = $('#forks');
       $forks.on('click','.pager_link',function(e){
-          ypjax(e.target.href,"forks",function(){
+          asynchtml(e.target.href, $forks, function(){
               show_more_event();
               tooltip_activate();
               show_changeset_tooltip();
           });
           e.preventDefault();
       });

kallithea/templates/journal/journal.html

➞

Show inline comments

@@ @@ -90,13 +90,13 @@ @@
         var val = $('#j_filter').val();
         window.location = "${url.current(filter='__FILTER__')}".replace('__FILTER__',val);
     });
     fix_j_filter_width($('#j_filter').val().length);
     $('#refresh').click(function(e){
-        ypjax("${h.url.current(filter=c.search_term)}","journal",function(){
+        asynchtml("${h.url.current(filter=c.search_term)}", $("#journal"), function(){
             show_more_event();
             tooltip_activate();
             show_changeset_tooltip();
             });
         e.preventDefault();
     });

kallithea/templates/journal/journal_data.html

➞

Show inline comments

@@ @@ -39,13 +39,13 @@ @@
   ${c.journal_pager.pager('$link_previous ~2~ $link_next')}
   </div>
     <script type="text/javascript">
     $(document).ready(function(){
         var $journal = $('#journal');
         $journal.on('click','.pager_link',function(e){
-            ypjax(e.target.href,"journal",function(){
+            asynchtml(e.target.href, $journal, function(){
                 show_more_event();
                 tooltip_activate();
                 show_changeset_tooltip();
             });
             e.preventDefault();
         });

kallithea/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -214,14 +214,14 @@ ${self.repo_context_bar('showpullrequest @@
       }; // gather the org/other ref and repo here
       for (k in rev_data){
           url = url.replace(k,rev_data[k]);
+      }
       ypjax(url,'pull_request_overview', function(o){
           var jsdata = eval('('+YUD.get('jsdata').innerHTML+')');
       asynchtml(url, $('#pull_request_overview'), function(o){
           var jsdata = eval('('+YUD.get('jsdata').innerHTML+')'); // TODO: just get json
           var r = new BranchRenderer('graph_canvas', 'graph_content_pr');
           r.render(jsdata,100);
       });
+  }
   $(document).ready(function(){

kallithea/templates/pullrequests/pullrequest_show_my.html

➞

Show inline comments

@@ @@ -31,13 +31,13 @@ pyroutes.register('my_pullrequests_data' @@
 var show_pullrequests = function(e){
     var url = pyroutes.url('my_pullrequests_data');
     if ($('#show_closed').prop('checked')) {
         var url = pyroutes.url('my_pullrequests_data', {'pr_show_closed': '1'});
+    }
-    ypjax(url, 'pullrequests_container', function(){
+    asynchtml(url, $('#pullrequests_container'), function(){
         // new #show_closed has just been loaded
         $('#show_closed').change(function (e) {
             show_pullrequests(e);
         });
     });
+}

0 comments (0 inline, 0 general)