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

Resolved merge conflicts

Browse source
This commit is contained in:
Andrii V 2025-11-24 15:29:54 +01:00
commit 5e477a58a2
38 changed files with 212 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rhodecode/templates/admin/auth/auth_settings.mako
View file

@ -96,7 +96,7 @@
</div>
<script>
$('.toggle-plugin').click(function(e){
$('.toggle-plugin').on('click', function(e){
var auth_plugins_input = $('#auth_plugins');
var elems = [];

4
rhodecode/templates/admin/gists/gist_edit.mako
View file

@ -77,7 +77,7 @@
if(detected_mode){
$(modes_select).select2("val", mimetype);
$(modes_select).change();
$(modes_select).trigger('change');
setCodeMirrorMode(myCodeMirror, detected_mode);
}
@ -126,7 +126,7 @@
$.Topic('/notifications').publish(alertMessage[0]);
}
else{
$('#eform').submit();
$('#eform').trigger('submit');
}
}
});

2
rhodecode/templates/admin/repos/repo_edit_issuetracker.mako
View file

@ -108,6 +108,6 @@
});
$('.reset-inheritance').on('click', function(e){
$('#inherit_global_issuetracker').prop('checked', false).change();
$('#inherit_global_issuetracker').prop('checked', false).trigger('change');
});
</script>

2
rhodecode/templates/admin/repos/repo_edit_maintenance.mako
View file

@ -57,7 +57,7 @@ executeTask = function() {
$(displayHtml).append(data);
$('#results').html(displayHtml);
btn.removeAttr('disabled');
btn.prop('disabled', false);
btn.removeClass('disabled');
};
ajaxGET(url, success, null);

2
rhodecode/templates/admin/repos/repo_edit_strip.mako
View file

@ -187,7 +187,7 @@ checkCommits = function() {
};
btn.html('Strip');
btn.removeAttr('disabled');
btn.prop('disabled', false);
btn.removeClass('disabled');
btn.attr('onclick','strip();return false;');
ajaxPOST(url, postData, success, null);

4
rhodecode/templates/admin/settings/settings_ai.mako
View file

@ -160,7 +160,7 @@ import json
setAIFieldsActive(this.checked);
});
$updateModelsBtn.click(function () {
$updateModelsBtn.on('click', function () {
const $apiKey = $('#rhodecode_ai_api_key input');
if (!$apiKey.val()) {
@ -211,7 +211,7 @@ import json
});
$form.submit(function () {
$form.on('submit', function () {
let $f = $(this);
let $tmpEnabled = $f.find(':disabled');

2
rhodecode/templates/admin/settings/settings_system.mako
View file

@ -96,7 +96,7 @@
</div>
<script>
$('#check_for_update').click(function(e){
$('#check_for_update').on('click', function(e){
$('#update_notice').show();
$('#update_notice').load("${h.route_path('admin_settings_system_update', _query={'ver': request.GET.get('ver')})}");
})

2
rhodecode/templates/base/base.mako
View file

@ -1195,7 +1195,7 @@
"use sctrict";
// details block auto-hide menu
$(document).mouseup(function(e) {
$(document).on('mouseup', function(e) {
var container = $('.details-inline-block');
if (!container.is(e.target) && container.has(e.target).length === 0) {
$('.details-inline-block[open]').removeAttr('open')

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

@ -1170,7 +1170,7 @@ def get_comments_for(diff_type, comments, filename, line_version, line_number):
// expand the container if we quick-select the field
$('#'+idSelector).next().prop('checked', false);
// hide the mast as we later do preventDefault()
$("#select2-drop-mask").click();
$("#select2-drop-mask").trigger('click');
window.location.hash = '#'+idSelector;
updateSticky();

4
rhodecode/templates/debug_style/code-block.html
View file

@ -1135,12 +1135,12 @@ $(document).ready(function () {
$('#selected_mode').html(detected_mode);
}
$('#ignorews').change(function(e){
$('#ignorews').on('change', function(e){
var val = e.currentTarget.checked;
$('#compare').mergely('options', {ignorews: val});
$('#compare').mergely('update');
});
$('#edit_mode').change(function(e){
$('#edit_mode').on('change', function(e){
var val = !e.currentTarget.checked;
$('#compare').mergely('cm', 'lhs').setOption('readOnly', val);
$('#compare').mergely('cm', 'rhs').setOption('readOnly', val);

2
rhodecode/templates/debug_style/collapsable-content.html
View file

@ -934,7 +934,7 @@ $(document).ready(function() {
elem.html(elem.html() + ' ' + total );
});
$('#merge_pull_request_form').submit(function() {
$('#merge_pull_request_form').on('submit', function() {
if (!$('#merge_pull_request').attr('disabled')) {
$('#merge_pull_request').attr('disabled', 'disabled');
}

2
rhodecode/templates/files/files.mako
View file

@ -50,7 +50,7 @@
var state = getFileState();
// select code link event
$("#hlcode").mouseup(getSelectionLink);
$("#hlcode").on('mouseup', getSelectionLink);
// file history select2 used for history of file, and switch to
var initialCommitData = {

6
rhodecode/templates/pullrequests/pullrequest_merge_checks.mako
View file

@ -131,15 +131,15 @@
<script>
$('#squash_merge_pull_request').click(function (e) {
$('#squash_merge_pull_request').on('click', function (e) {
e.preventDefault();
$('#squash_merge_pull_request_value').val("true");
$('#merge_pull_request_form').submit();
$('#merge_pull_request_form').trigger('submit');
});
$('#merge_pull_request_form').submit(function () {
$('#merge_pull_request_form').on('submit', function () {
if (!$('#merge_pull_request').attr('disabled')) {
$('#merge_pull_request').attr('disabled', 'disabled');
}

6
rhodecode/templates/pullrequests/pullrequest_show.mako
View file

@ -978,7 +978,7 @@ window.setObserversData = ${c.pull_request_set_observers_data_json | n};
// inject closing flag
$('.action-buttons-extra').append('<input type="hidden" class="close-pr-input" id="close_pull_request" value="1">');
$(generalCommentForm.statusChange).select2("val", status).trigger('change');
$(generalCommentForm.submitForm).submit();
$(generalCommentForm.submitForm).trigger('submit');
};
//TODO this functionality is now missing
@ -995,7 +995,7 @@ window.setObserversData = ${c.pull_request_set_observers_data_json | n};
}
});
$('#merge_pull_request_form').submit(function () {
$('#merge_pull_request_form').on('submit', function () {
if (!$('#merge_pull_request').attr('disabled')) {
$('#merge_pull_request').attr('disabled', 'disabled');
}
@ -1038,7 +1038,7 @@ window.setObserversData = ${c.pull_request_set_observers_data_json | n};
});
// fixing issue with caches on firefox
$('#update_commits').removeAttr("disabled");
$('#update_commits').prop('disabled', false);
$('.show-inline-comments').on('click', function (e) {
var boxid = $(this).attr('data-comment-id');