Skip to content

Remove usage of some JS globals #15378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
techknowlogick merged 2 commits into from
Apr 9, 2021
Merged

Remove usage of some JS globals #15378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9f8c9e
Remove usage of JS globals
silverwind Apr 9, 2021
d13bb67
Merge branch 'master' into rmexports
techknowlogick Apr 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion templates/repo/diff/comment_form.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
{{end}}
{{end}}
{{if or (not $.HasComments) $.hidden}}
<button type="button" class="ui submit tiny basic button btn-cancel" onclick="window.cancelCodeComment(this);">{{$.root.i18n.Tr "cancel"}}</button>
<button type="button" class="ui submit tiny basic button btn-cancel cancel-code-comment">{{$.root.i18n.Tr "cancel"}}</button>
{{end}}
</div>
</div>
Expand Down
6 changes: 2 additions & 4 deletions templates/repo/issue/view_content/sidebar.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,8 +467,7 @@
</div>
<div class="item-right df ac">
{{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}}
<a class="delete-dependency-button poping up ci" onclick="window.deleteDependencyModal({{.Issue.ID}}, 'blocking');"
data-content="{{$.i18n.Tr "repo.issues.dependency.remove_info"}}" data-inverted="">
<a class="delete-dependency-button poping up ci" data-id="{{.Issue.ID}}" data-type="blocking" data-content="{{$.i18n.Tr "repo.issues.dependency.remove_info"}}" data-inverted="">
{{svg "octicon-trash" 16}}
</a>
{{end}}
Expand All @@ -495,8 +494,7 @@
</div>
<div class="item-right df ac">
{{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}}
<a class="delete-dependency-button poping up ci" onclick="window.deleteDependencyModal({{.Issue.ID}}, 'blockedBy');"
data-content="{{$.i18n.Tr "repo.issues.dependency.remove_info"}}" data-inverted="">
<a class="delete-dependency-button poping up ci" data-id="{{.Issue.ID}}" data-type="blockedBy" data-content="{{$.i18n.Tr "repo.issues.dependency.remove_info"}}" data-inverted="">
{{svg "octicon-trash" 16}}
</a>
{{end}}
Expand Down
5 changes: 2 additions & 3 deletions templates/user/auth/signin_inner.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
{{if and .OrderedOAuth2Names .OAuth2Providers}}
<div class="ui attached segment">
<div class="oauth2 center">
<div id="oauth2-login-loader" class="ui disabled centered loader"></div>
<div id="oauth2-login-loader" class="ui disabled centered loader"></div>
<div>
<div id="oauth2-login-navigator">
<p>{{.i18n.Tr "sign_in_with"}}</p>
Expand All @@ -63,9 +63,8 @@
<img
alt="{{$provider.DisplayName}}{{if eq $provider.Name "openidConnect"}} ({{$key}}){{end}}"
title="{{$provider.DisplayName}}{{if eq $provider.Name "openidConnect"}} ({{$key}}){{end}}"
class="{{$provider.Name}}"
class="{{$provider.Name}} oauth-login-image"
src="{{AppSubUrl}}{{$provider.Image}}"
onclick="window.onOAuthLoginClick()"
></a>
{{end}}
</div>
Expand Down
56 changes: 29 additions & 27 deletions web_src/js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/* exported deleteDependencyModal, cancelCodeComment, onOAuthLoginClick */

import './publicpath.js';

import Vue from 'vue';
Expand Down Expand Up @@ -1156,6 +1154,32 @@ async function initRepository() {
return false;
});

// Delete Issue dependency
$(document).on('click', '.delete-dependency-button', (e) => {
const {id, type} = e.currentTarget.dataset;

$('.remove-dependency').modal({
closable: false,
duration: 200,
onApprove: () => {
$('#removeDependencyID').val(id);
$('#dependencyType').val(type);
$('#removeDependencyForm').trigger('submit');
}
}).modal('show');
});

// Cancel inline code comment
$(document).on('click', '.cancel-code-comment', (e) => {
const form = $(e.currentTarget).closest('form');
if (form.length > 0 && form.hasClass('comment-form')) {
form.addClass('hide');
form.parent().find('button.comment-form-reply').show();
} else {
form.closest('.comment-code-cloud').remove();
}
});

// Change status
const $statusButton = $('#status-button');
$('#comment-form textarea').on('keyup', function () {
Expand Down Expand Up @@ -1193,6 +1217,7 @@ async function initRepository() {
$mergeButton.parent().show();
$('.instruct-toggle').show();
});

initReactionSelector();
}

Expand Down Expand Up @@ -3812,19 +3837,6 @@ function initIssueDue() {
});
}

window.deleteDependencyModal = function (id, type) {
$('.remove-dependency')
.modal({
closable: false,
duration: 200,
onApprove() {
$('#removeDependencyID').val(id);
$('#dependencyType').val(type);
$('#removeDependencyForm').trigger('submit');
}
}).modal('show');
};

function initIssueList() {
const repolink = $('#repolink').val();
const repoId = $('#repoId').val();
Expand Down Expand Up @@ -3911,17 +3923,7 @@ $(document).on('submit', '.conversation-holder form', async (e) => {
initClipboard();
});

window.cancelCodeComment = function (btn) {
const form = $(btn).closest('form');
if (form.length > 0 && form.hasClass('comment-form')) {
form.addClass('hide');
form.parent().find('button.comment-form-reply').show();
} else {
form.closest('.comment-code-cloud').remove();
}
};

window.onOAuthLoginClick = function () {
$(document).on('click', '.oauth-login-image', () => {
const oauthLoader = $('#oauth2-login-loader');
const oauthNav = $('#oauth2-login-navigator');

Expand All @@ -3934,4 +3936,4 @@ window.onOAuthLoginClick = function () {
oauthLoader.addClass('disabled');
oauthNav.show();
}, 5000);
};
});