engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

diffs: fixed scope mismatch for diff navigation

Browse source
This commit is contained in:
Marcin Kuzminski 2018-10-25 18:03:30 +02:00
parent 6f967a47bf
commit 4fb98500a9
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
rhodecode/templates/codeblocks/diffs.mako
View file

@ -850,7 +850,8 @@ def get_comments_for(diff_type, comments, filename, line_version, line_number):
}(result, escapeMarkup);
};
var preloadData = {
var preloadFileFilterData = {
results: [
% for filediff in diffset.files:
{id:"a_${h.FID(filediff.raw_id, filediff.patch['filename'])}",
@ -868,15 +869,15 @@ def get_comments_for(diff_type, comments, filename, line_version, line_number):
'placeholder': "${file_placeholder}",
containerCssClass: "drop-menu",
dropdownCssClass: "drop-menu-dropdown",
data: preloadData,
data: preloadFileFilterData,
query: function(query) {
feedFilesOptions(query, preloadData);
feedFilesOptions(query, preloadFileFilterData);
},
formatResult: formatFileResult
});
% if range_diff_on is True:
fileFilter.select2("enable", false);
% endif
$("#file_filter").on('click', function (e) {
@ -948,7 +949,7 @@ def get_comments_for(diff_type, comments, filename, line_version, line_number):
}
);
var preloadData = {
var preloadDiffMenuData = {
results: [
## Wide diff mode
{
@ -1004,7 +1005,7 @@ def get_comments_for(diff_type, comments, filename, line_version, line_number):
containerCssClass: "drop-menu",
dropdownCssClass: "drop-menu-dropdown",
dropdownAutoWidth: true,
data: preloadData,
data: preloadDiffMenuData,
placeholder: "${_('Diff Options')}",
});
$("#diff_menu").on('select2-selecting', function (e) {