kallithea Changeset - ff3f10a6a203

Changeset - ff3f10a6a203

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Mads Kiilerich - 13 years ago 2013-03-07 19:00:28
madski@unity3d.com

Transplanted from: 6b0c23e9b32f

pullrequest: just replace children of other_ref when other_repo changes

We were inserting a full select statement as innerHTML of a select and would
thus get nested select statements. IE did not render that correctly ... and
other browsers did strange things.

Instead we now create a in memory DOM object and move the optgroups. After
appending children to the selector we have to set selectedIndex on all
browsers.

2 files changed with 12 insertions and 20 deletions:

rhodecode/public/js/rhodecode.js

rhodecode/templates/pullrequests/pullrequest.html

0 comments (0 inline, 0 general)

rhodecode/public/js/rhodecode.js

➞

Show inline comments

@@ @@ -86,19 +86,6 @@ var prevElementSibling = function( el ) @@
+    }
+}
 var setSelectValue = function(select, val){
 	var selection =  YUD.get(select);
     // select element
     for(var i=0;i<selection.options.length;i++){
         if (selection.options[i].innerHTML == val) {
             selection.selectedIndex = i;
             break;
+        }
+    }
+}
 /**
  * SmartColorGenerator
+ *

rhodecode/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -161,12 +161,19 @@ @@
       ypjax(url,'pull_request_overview', function(data){
           var sel_box = YUQ('#pull_request_form #other_repo')[0];
           var repo_name = sel_box.options[sel_box.selectedIndex].value;
           YUD.get('other_repo_desc').innerHTML = other_repos_info[repo_name]['description'];
           // replace options of other_ref with the ones for the current other_repo
           var other_ref_selector = YUD.get('other_ref');
           var new_select = YUD.createElementFromMarkup(other_repos_info[repo_name]['revs']);
           var new_selectedIndex = new_select.selectedIndex;
           other_ref_selector.innerHTML = ""; // clear old options
           while (new_select.length > 0){ // children will be popped when appened to other_ref_selector
               other_ref_selector.appendChild(new_select.children[0]);
+          }
           // browsers lost track of selected when appendChild was used
           other_ref_selector.selectedIndex = new_selectedIndex;
           // reset && add the reviewer based on selected repo
           var _data = other_repos_info[repo_name];
           YUD.get('other_repo_desc').innerHTML = other_repos_info[repo_name]['description'];
           YUD.get('other_ref').innerHTML = other_repos_info[repo_name]['revs'];
           // select back the revision that was just compared
           setSelectValue(YUD.get('other_ref'), rev_data['other_ref']);
           // reset && add the reviewer based on selected repo
           YUD.get('review_members').innerHTML = '';
           addReviewMember(_data.user.user_id, _data.user.firstname,
                           _data.user.lastname, _data.user.username,
@@ @@ -182,8 +189,6 @@ @@
   YUE.on('other_repo', 'change', function(e){
       var repo_name = e.currentTarget.value;
       // replace the <select> of changed repo
       YUD.get('other_ref').innerHTML = other_repos_info[repo_name]['revs'];
       loadPreview();
   });

0 comments (0 inline, 0 general)