kallithea Changeset - 5dfe741d2b0a

Changeset - 5dfe741d2b0a

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 9 years ago 2016-06-29 16:52:07
madski@unity3d.com

js: workaround to avoid <option> tags inside <script>

The naive formencode html parser would sometimes (Python 2.6?) fail with
AssertionError: <option> outside of <select>

2 files changed with 2 insertions and 2 deletions:

kallithea/templates/base/base.html

kallithea/templates/pullrequests/pullrequest.html

0 comments (0 inline, 0 general)

kallithea/templates/base/base.html

➞

Show inline comments

@@ @@ -262,25 +262,25 @@ @@
       $("#branch_switcher").on('select2-selecting', function(e) {
           e.preventDefault();
           var context = $('#context-bar .current').data('context');
           if (context == 'files') {
               window.location = pyroutes.url('files_home', {
                   'repo_name': REPO_NAME,
                   'revision': e.choice.id,
                   'f_path': '',
                   'at': e.choice.text
               });
           } else if (context == 'changelog') {
               if (e.choice.type == 'tag' || e.choice.type == 'book') {
                   $("#branch_filter").append($('<option/>').val(e.choice.text));
+                  $("#branch_filter").append($('<'+'option/>').val(e.choice.text));
+              }
               $("#branch_filter").val(e.choice.text).change();
           } else {
               window.location = pyroutes.url('changelog_home', {
                   'repo_name': '${c.repo_name}',
                   'branch': e.choice.text
               });
+          }
       });
     });
   </script>
   <!--- END CONTEXT BAR -->

kallithea/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -125,25 +125,25 @@ ${self.repo_context_bar('showpullrequest @@
               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/>').prop('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]));
+                  $optgroup.append($('<'+'option/>').text(options[j][1]).val(options[j][0]));
+                }
                 $other_ref.append($optgroup);
+              }
               $other_ref.val(data.selected_ref);
               // re-populate the select2 thingy
               $("#other_ref").select2({
                   dropdownAutoWidth: true
               });
               $other_ref.prop('disabled', false);
               loadPreview();

0 comments (0 inline, 0 general)