kallithea Changeset - 72747179701a

Changeset - 72747179701a

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

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

javascript: ypjax cleanup

Set 'Loading ...' while waiting for response.

2 files changed with 4 insertions and 7 deletions:

kallithea/public/js/base.js

kallithea/templates/pullrequests/pullrequest.html

0 comments (0 inline, 0 general)

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -370,35 +370,33 @@ var _toQueryString = function(o) { @@
  */
 function ypjax(url,container,s_call,args){
     var method='GET';
     if(args===undefined){
         args=null;
+    }
     $container = $('#' + container);
     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){
             $container.html(o.responseText);
             $container.css('opacity','1.0');
             $target.html(o.responseText).css('opacity','1.0');
             //execute the given original callback
             if (s_call !== undefined && s_call){
                 s_call();
+            }
+        }
     })()
     $container.css('opacity','0.3');
     YUC.asyncRequest(method,url,{
         success:s_wrapper,
         failure:function(o){
             console.log('ypjax failure: '+o);
             $container.html('<span class="error_red">ERROR: {0}</span>'.format(o.status));
             $container.css('opacity','1.0');
             $target.html('<span class="error_red">ERROR: {0}</span>'.format(o.status)).css('opacity','1.0');
         },
         cache:false
     },args);
 };

kallithea/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -214,13 +214,12 @@ ${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]);
+      }
       YUD.get('pull_request_overview').innerHTML = "${_('Loading ...')}";
       ypjax(url,'pull_request_overview', function(o){
           var jsdata = eval('('+YUD.get('jsdata').innerHTML+')');
           var r = new BranchRenderer('graph_canvas', 'graph_content_pr');
           r.render(jsdata,100);
       });
+  }

0 comments (0 inline, 0 general)