kallithea Changeset - 94a7abdac8f6

Changeset - 94a7abdac8f6

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Takumi IINO - 11 years ago 2014-11-29 08:04:48
trot.thunder@gmail.com

javascripts: replace YUI with jquery in kallithea/templates/pullrequests/pullrequest.html

1 file changed with 7 insertions and 8 deletions:

kallithea/templates/pullrequests/pullrequest.html

0 comments (0 inline, 0 general)

kallithea/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -155,85 +155,84 @@ ${self.repo_context_bar('showpullrequest @@
           pendingajax.abort();
           pendingajax = undefined;
+      }
       pendingajax = ajaxGET(pyroutes.url('pullrequest_repo_info', {"repo_name": repo_name}),
           function(data){
               pendingajax = undefined;
               $('#other_repo_desc').html(data.description);
               // replace options of other_ref with the ones for the current other_repo
               $other_ref.empty();
               for(var i = 0; i < data.refs.length; i++)
+              {
                 var $optgroup = $('<optgroup/>').attr('label', data.refs[i][1]);
                 var options = data.refs[i][0];
                 var length = options.length;
                 for(var j = 0; j < length; j++)
+                {
                   $optgroup.append($('<option/>').text(options[j][1]).val(options[j][0]));
+                }
                 $other_ref.append($optgroup);
+              }
               $other_ref.val(data.selected_ref);
               // reset && add the reviewer based on selected repo
-              YUD.get('review_members').innerHTML = '';
+              $('#review_members').html('');
               addReviewMember(data.user.user_id, data.user.firstname,
                               data.user.lastname, data.user.username,
                               data.user.gravatar_link);
               // re-populate the select2 thingie
               $("#other_ref").select2({
                   dropdownAutoWidth: true
               });
               $other_ref.prop('disabled', false);
               loadPreview();
           });
   };
   var loadPreview = function(){
       //url template
       var url = "${h.url('compare_url',
                          repo_name='__other_repo__',
                          org_ref_type='rev',
                          org_ref_name='__other_ref_name__',
                          other_repo='__org_repo__',
                          other_ref_type='rev',
                          other_ref_name='__org_ref_name__',
                          as_form=True,
                          merge=True,
                          )}";
       var org_repo = YUQ('#pull_request_form #org_repo')[0].value;
       var org_ref = YUQ('#pull_request_form #org_ref')[0].value.split(':');
       var org_repo = $('#pull_request_form #org_repo').val();
       var org_ref = $('#pull_request_form #org_ref').val().split(':');
       ## TODO: make nice link like link_to_ref() do
-      YUD.get('org_rev_span').innerHTML = org_ref[2].substr(0,12);
+      $('#org_rev_span').html(org_ref[2].substr(0,12));
       var other_repo = YUQ('#pull_request_form #other_repo')[0].value;
       var other_ref = YUQ('#pull_request_form #other_ref')[0].value.split(':');
       YUD.get('other_rev_span').innerHTML = other_ref[2].substr(0,12);
       var other_repo = $('#pull_request_form #other_repo').val();
       var other_ref = $('#pull_request_form #other_ref').val().split(':');
       $('#other_rev_span').html(other_ref[2].substr(0,12));
       var select_refs = YUQ('#pull_request_form select.refs')
       var rev_data = {
           '__org_repo__': org_repo,
           '__org_ref_name__': org_ref[2],
           '__other_repo__': other_repo,
           '__other_ref_name__': other_ref[2]
       }; // gather the org/other ref and repo here
       for (k in rev_data){
           url = url.replace(k,rev_data[k]);
+      }
       if (pendingajax) {
           pendingajax.abort();
           pendingajax = undefined;
+      }
       pendingajax = asynchtml(url, $('#pull_request_overview'), function(o){
           pendingajax = undefined;
           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(){

0 comments (0 inline, 0 general)