Skip to content

Restructure JS files #30480

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.

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

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import $ from 'jquery';
import {checkAppUrl} from '../common-global.js';
import {hideElem, showElem, toggleElem} from '../../utils/dom.js';
import {POST} from '../../modules/fetch.js';
import {checkAppUrl} from '../features/common-global.js';
import {hideElem, showElem, toggleElem} from '../utils/dom.js';
import {POST} from '../modules/fetch.js';

const {appSubUrl} = window.config;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {showTemporaryTooltip} from '../../modules/tippy.js';
import {POST} from '../../modules/fetch.js';
import {showTemporaryTooltip} from '../modules/tippy.js';
import {POST} from '../modules/fetch.js';

const {appSubUrl} = window.config;

Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import '@github/markdown-toolbar-element';
import '@github/text-expander-element';
import $ from 'jquery';
import {attachTribute} from '../tribute.js';
import {hideElem, showElem, autosize, isElemVisible} from '../../utils/dom.js';
import {attachTribute} from '../features/tribute.js';
import {hideElem, showElem, autosize, isElemVisible} from '../utils/dom.js';
import {initEasyMDEPaste, initTextareaPaste} from './Paste.js';
import {handleGlobalEnterQuickSubmit} from './QuickSubmit.js';
import {renderPreviewPanelContent} from '../repo-editor.js';
import {renderPreviewPanelContent} from '../repo/editor.js';
import {easyMDEToolbarActions} from './EasyMDEToolbarActions.js';
import {initTextExpander} from './TextExpander.js';
import {showErrorToast} from '../../modules/toast.js';
import {POST} from '../../modules/fetch.js';
import {showErrorToast} from '../modules/toast.js';
import {POST} from '../modules/fetch.js';

let elementIdCounter = 0;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import $ from 'jquery';
import {svg} from '../../svg.js';
import {svg} from '../svg.js';
import {htmlEscape} from 'escape-goat';

const {i18n} = window.config;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {svg} from '../../svg.js';
import {svg} from '../svg.js';

export function easyMDEToolbarActions(EasyMDE, editor) {
const actions = {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {htmlEscape} from 'escape-goat';
import {POST} from '../../modules/fetch.js';
import {imageInfo} from '../../utils/image.js';
import {getPastedContent, replaceTextareaSelection} from '../../utils/dom.js';
import {isUrl} from '../../utils/url.js';
import {POST} from '../modules/fetch.js';
import {imageInfo} from '../utils/image.js';
import {getPastedContent, replaceTextareaSelection} from '../utils/dom.js';
import {isUrl} from '../utils/url.js';

async function uploadFile(file, uploadUrl) {
const formData = new FormData();
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import $ from 'jquery';
import {POST} from '../../modules/fetch.js';
import {POST} from '../modules/fetch.js';

export function initCompReactionSelector() {
for (const container of document.querySelectorAll('.issue-content, .diff-file-body')) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {matchEmoji, matchMention} from '../../utils/match.js';
import {emojiString} from '../emoji.js';
import {matchEmoji, matchMention} from '../utils/match.js';
import {emojiString} from '../features/emoji.js';

export function initTextExpander(expander) {
expander?.addEventListener('text-expander-change', ({detail: {key, provide, text}}) => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {POST} from '../../modules/fetch.js';
import {hideElem, showElem, toggleElem} from '../../utils/dom.js';
import {POST} from '../modules/fetch.js';
import {hideElem, showElem, toggleElem} from '../utils/dom.js';

export function initCompWebHookEditor() {
if (!document.querySelectorAll('.new.webhook').length) {
Expand Down
2 changes: 1 addition & 1 deletion web_src/js/components/DiffFileList.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script>
import {loadMoreFiles} from '../features/repo-diff.js';
import {loadMoreFiles} from '../repo/diff.js';
import {diffTreeStore} from '../modules/stores.js';

export default {
Expand Down
2 changes: 1 addition & 1 deletion web_src/js/components/DiffFileTree.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script>
import DiffFileTreeItem from './DiffFileTreeItem.vue';
import {loadMoreFiles} from '../features/repo-diff.js';
import {loadMoreFiles} from '../repo/diff.js';
import {toggleElem} from '../utils/dom.js';
import {diffTreeStore} from '../modules/stores.js';
import {setFileFolding} from '../features/file-fold.js';
Expand Down
4 changes: 2 additions & 2 deletions web_src/js/features/common-global.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import '../vendor/jquery.are-you-sure.js';
import {clippie} from 'clippie';
import {createDropzone} from './dropzone.js';
import {showGlobalErrorMessage} from '../bootstrap.js';
import {handleGlobalEnterQuickSubmit} from './comp/QuickSubmit.js';
import {handleGlobalEnterQuickSubmit} from '../comp/QuickSubmit.js';
import {svg} from '../svg.js';
import {hideElem, showElem, toggleElem, initSubmitEventPolyfill, submitEventSubmitter} from '../utils/dom.js';
import {htmlEscape} from 'escape-goat';
import {showTemporaryTooltip} from '../modules/tippy.js';
import {confirmModal} from './comp/ConfirmModal.js';
import {confirmModal} from '../comp/ConfirmModal.js';
import {showErrorToast} from '../modules/toast.js';
import {request, POST, GET} from '../modules/fetch.js';
import '../htmx.js';
Expand Down
2 changes: 1 addition & 1 deletion web_src/js/features/common-organization.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {initCompLabelEdit} from './comp/LabelEdit.js';
import {initCompLabelEdit} from '../comp/LabelEdit.js';
import {toggleElem} from '../utils/dom.js';

export function initCommonOrganization() {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 5 additions & 5 deletions web_src/js/modules/fomantic.js → web_src/js/fomantic/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import $ from 'jquery';
import {initFomanticApiPatch} from './fomantic/api.js';
import {initAriaCheckboxPatch} from './fomantic/checkbox.js';
import {initAriaDropdownPatch} from './fomantic/dropdown.js';
import {initAriaModalPatch} from './fomantic/modal.js';
import {initFomanticTransition} from './fomantic/transition.js';
import {initFomanticApiPatch} from './api.js';
import {initAriaCheckboxPatch} from './checkbox.js';
import {initAriaDropdownPatch} from './dropdown.js';
import {initAriaModalPatch} from './modal.js';
import {initFomanticTransition} from './transition.js';
import {svg} from '../svg.js';

export const fomanticMobileScreen = window.matchMedia('only screen and (max-width: 767.98px)');
Expand Down
File renamed without changes.
58 changes: 29 additions & 29 deletions web_src/js/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ import {initDashboardRepoList} from './components/DashboardRepoList.vue';

import {initGlobalCopyToClipboardListener} from './features/clipboard.js';
import {initContextPopups} from './features/contextpopup.js';
import {initRepoGraphGit} from './features/repo-graph.js';
import {initRepoGraphGit} from './repo/graph.js';
import {initHeatmap} from './features/heatmap.js';
import {initImageDiff} from './features/imagediff.js';
import {initRepoMigration} from './features/repo-migration.js';
import {initRepoProject} from './features/repo-projects.js';
import {initRepoMigration} from './repo/migration.js';
import {initRepoProject} from './repo/projects.js';
import {initTableSort} from './features/tablesort.js';
import {initAutoFocusEnd} from './features/autofocus-end.js';
import {initAdminUserListSearchForm} from './features/admin/users.js';
import {initAdminConfigs} from './features/admin/config.js';
import {initAdminUserListSearchForm} from './admin/users.js';
import {initAdminConfigs} from './admin/config.js';
import {initMarkupAnchors} from './markup/anchors.js';
import {initNotificationCount, initNotificationsTable} from './features/notification.js';
import {initRepoIssueContentHistory} from './features/repo-issue-content.js';
import {initRepoIssueContentHistory} from './repo/issue-content.js';
import {initStopwatch} from './features/stopwatch.js';
import {initFindFileInRepo} from './features/repo-findfile.js';
import {initFindFileInRepo} from './repo/findfile.js';
import {initCommentContent, initMarkupContent} from './markup/content.js';
import {initPdfViewer} from './render/pdf.js';

Expand All @@ -33,8 +33,8 @@ import {
initRepoPullRequestMergeInstruction,
initRepoPullRequestAllowMaintainerEdit,
initRepoPullRequestReview, initRepoIssueSidebarList, initArchivedLabelHandler,
} from './features/repo-issue.js';
import {initRepoEllipsisButton, initCommitStatuses} from './features/repo-commit.js';
} from './repo/issue.js';
import {initRepoEllipsisButton, initCommitStatuses} from './repo/commit.js';
import {
initFootLanguageMenu,
initGlobalButtonClickOnEnter,
Expand All @@ -46,46 +46,46 @@ import {
initGlobalLinkActions,
initHeadNavbarContentToggle,
} from './features/common-global.js';
import {initRepoTopicBar} from './features/repo-home.js';
import {initAdminEmails} from './features/admin/emails.js';
import {initAdminCommon} from './features/admin/common.js';
import {initRepoTemplateSearch} from './features/repo-template.js';
import {initRepoCodeView} from './features/repo-code.js';
import {initRepoTopicBar} from './repo/home.js';
import {initAdminEmails} from './admin/emails.js';
import {initAdminCommon} from './admin/common.js';
import {initRepoTemplateSearch} from './repo/template.js';
import {initRepoCodeView} from './repo/code.js';
import {initSshKeyFormParser} from './features/sshkey-helper.js';
import {initUserSettings} from './features/user-settings.js';
import {initRepoArchiveLinks} from './features/repo-common.js';
import {initRepoMigrationStatusChecker} from './features/repo-migrate.js';
import {initRepoArchiveLinks} from './repo/common.js';
import {initRepoMigrationStatusChecker} from './repo/migrate.js';
import {
initRepoSettingGitHook,
initRepoSettingsCollaboration,
initRepoSettingSearchTeamBox,
} from './features/repo-settings.js';
import {initRepoDiffView} from './features/repo-diff.js';
} from './repo/settings.js';
import {initRepoDiffView} from './repo/diff.js';
import {initOrgTeamSearchRepoBox, initOrgTeamSettings} from './features/org-team.js';
import {initUserAuthWebAuthn, initUserAuthWebAuthnRegister} from './features/user-auth-webauthn.js';
import {initRepoRelease, initRepoReleaseNew} from './features/repo-release.js';
import {initRepoEditor} from './features/repo-editor.js';
import {initCompSearchUserBox} from './features/comp/SearchUserBox.js';
import {initRepoRelease, initRepoReleaseNew} from './repo/release.js';
import {initRepoEditor} from './repo/editor.js';
import {initCompSearchUserBox} from './comp/SearchUserBox.js';
import {initInstall} from './features/install.js';
import {initCompWebHookEditor} from './features/comp/WebHookEditor.js';
import {initRepoBranchButton} from './features/repo-branch.js';
import {initCompWebHookEditor} from './comp/WebHookEditor.js';
import {initRepoBranchButton} from './repo/branch.js';
import {initCommonOrganization} from './features/common-organization.js';
import {initRepoWikiForm} from './features/repo-wiki.js';
import {initRepoCommentForm, initRepository} from './features/repo-legacy.js';
import {initRepoWikiForm} from './repo/wiki.js';
import {initRepoCommentForm, initRepository} from './repo/legacy.js';
import {initCopyContent} from './features/copycontent.js';
import {initCaptcha} from './features/captcha.js';
import {initRepositoryActionView} from './components/RepoActionView.vue';
import {initGlobalTooltips} from './modules/tippy.js';
import {initGiteaFomantic} from './modules/fomantic.js';
import {initGiteaFomantic} from './fomantic/index.js';
import {onDomReady} from './utils/dom.js';
import {initRepoIssueList} from './features/repo-issue-list.js';
import {initRepoIssueList} from './repo/issue-list.js';
import {initCommonIssueListQuickGoto} from './features/common-issue-list.js';
import {initRepoContributors} from './features/contributors.js';
import {initRepoCodeFrequency} from './features/code-frequency.js';
import {initRepoRecentCommits} from './features/recent-commits.js';
import {initRepoDiffCommitBranchesAndTags} from './features/repo-diff-commit.js';
import {initRepoDiffCommitBranchesAndTags} from './repo/diff-commit.js';
import {initDirAuto} from './modules/dirauto.js';
import {initRepositorySearch} from './features/repo-search.js';
import {initRepositorySearch} from './repo/search.js';
import {initColorPickers} from './features/colorpicker.js';

// Init Gitea's Fomantic settings
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import $ from 'jquery';
import {svg} from '../svg.js';
import {invertFileFolding} from './file-fold.js';
import {invertFileFolding} from '../features/file-fold.js';
import {createTippy} from '../modules/tippy.js';
import {clippie} from 'clippie';
import {toAbsoluteUrl} from '../utils.js';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {singleAnchorRegex, rangeAnchorRegex} from './repo-code.js';
import {singleAnchorRegex, rangeAnchorRegex} from './code.js';

test('singleAnchorRegex', () => {
expect(singleAnchorRegex.test('#L0')).toEqual(false);
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
14 changes: 7 additions & 7 deletions web_src/js/features/repo-diff.js → web_src/js/repo/diff.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import $ from 'jquery';
import {initCompReactionSelector} from './comp/ReactionSelector.js';
import {initRepoIssueContentHistory} from './repo-issue-content.js';
import {initDiffFileTree} from './repo-diff-filetree.js';
import {initDiffCommitSelect} from './repo-diff-commitselect.js';
import {validateTextareaNonEmpty} from './comp/ComboMarkdownEditor.js';
import {initViewedCheckboxListenerFor, countAndUpdateViewedFiles, initExpandAndCollapseFilesButton} from './pull-view-file.js';
import {initImageDiff} from './imagediff.js';
import {initCompReactionSelector} from '../comp/ReactionSelector.js';
import {initRepoIssueContentHistory} from './issue-content.js';
import {initDiffFileTree} from './diff-filetree.js';
import {initDiffCommitSelect} from './diff-commitselect.js';
import {validateTextareaNonEmpty} from '../comp/ComboMarkdownEditor.js';
import {initViewedCheckboxListenerFor, countAndUpdateViewedFiles, initExpandAndCollapseFilesButton} from '../features/pull-view-file.js';
import {initImageDiff} from '../features/imagediff.js';
import {showErrorToast} from '../modules/toast.js';
import {submitEventSubmitter, queryElemSiblings, hideElem, showElem} from '../utils/dom.js';
import {POST, GET} from '../modules/fetch.js';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import $ from 'jquery';
import {htmlEscape} from 'escape-goat';
import {createCodeEditor} from './codeeditor.js';
import {createCodeEditor} from '../features/codeeditor.js';
import {hideElem, showElem} from '../utils/dom.js';
import {initMarkupContent} from '../markup/content.js';
import {attachRefIssueContextPopup} from './contextpopup.js';
import {attachRefIssueContextPopup} from '../features/contextpopup.js';
import {POST} from '../modules/fetch.js';

function initEditPreviewTab($form) {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {strSubMatch, calcMatchedWeight, filterRepoFilesWeighted} from './repo-findfile.js';
import {strSubMatch, calcMatchedWeight, filterRepoFilesWeighted} from './findfile.js';

describe('Repo Find Files', () => {
test('strSubMatch', () => {
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import $ from 'jquery';
import {handleReply} from './repo-issue.js';
import {getComboMarkdownEditor, initComboMarkdownEditor} from './comp/ComboMarkdownEditor.js';
import {createDropzone} from './dropzone.js';
import {handleReply} from './issue.js';
import {getComboMarkdownEditor, initComboMarkdownEditor} from '../comp/ComboMarkdownEditor.js';
import {createDropzone} from '../features/dropzone.js';
import {GET, POST} from '../modules/fetch.js';
import {hideElem, showElem} from '../utils/dom.js';
import {attachRefIssueContextPopup} from './contextpopup.js';
import {attachRefIssueContextPopup} from '../features/contextpopup.js';
import {initCommentContent, initMarkupContent} from '../markup/content.js';

const {csrfToken} = window.config;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import $ from 'jquery';
import {updateIssuesMeta} from './repo-issue.js';
import {updateIssuesMeta} from './issue.js';
import {toggleElem, hideElem, isElemHidden} from '../utils/dom.js';
import {htmlEscape} from 'escape-goat';
import {confirmModal} from './comp/ConfirmModal.js';
import {confirmModal} from '../comp/ConfirmModal.js';
import {showErrorToast} from '../modules/toast.js';
import {createSortable} from '../modules/sortable.js';
import {DELETE, POST} from '../modules/fetch.js';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import $ from 'jquery';
import {htmlEscape} from 'escape-goat';
import {showTemporaryTooltip, createTippy} from '../modules/tippy.js';
import {hideElem, showElem, toggleElem} from '../utils/dom.js';
import {setFileFolding} from './file-fold.js';
import {getComboMarkdownEditor, initComboMarkdownEditor} from './comp/ComboMarkdownEditor.js';
import {setFileFolding} from '../features/file-fold.js';
import {getComboMarkdownEditor, initComboMarkdownEditor} from '../comp/ComboMarkdownEditor.js';
import {toAbsoluteUrl} from '../utils.js';
import {initDropzone} from './common-global.js';
import {initDropzone} from '../features/common-global.js';
import {POST, GET} from '../modules/fetch.js';

const {appSubUrl} = window.config;
Expand Down
22 changes: 11 additions & 11 deletions web_src/js/features/repo-legacy.js → web_src/js/repo/legacy.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,24 @@ import {
initRepoIssueComments, initRepoIssueDependencyDelete, initRepoIssueReferenceIssue,
initRepoIssueTitleEdit, initRepoIssueWipToggle,
initRepoPullRequestUpdate, updateIssuesMeta, initIssueTemplateCommentEditors, initSingleCommentEditor,
} from './repo-issue.js';
import {initUnicodeEscapeButton} from './repo-unicode-escape.js';
} from './issue.js';
import {initUnicodeEscapeButton} from './unicode-escape.js';
import {svg} from '../svg.js';
import {htmlEscape} from 'escape-goat';
import {initRepoBranchTagSelector} from '../components/RepoBranchTagSelector.vue';
import {
initRepoCloneLink, initRepoCommonBranchOrTagDropdown, initRepoCommonFilterSearchDropdown,
} from './repo-common.js';
import {initCitationFileCopyContent} from './citation.js';
import {initCompLabelEdit} from './comp/LabelEdit.js';
import {initRepoDiffConversationNav} from './repo-diff.js';
import {initCompReactionSelector} from './comp/ReactionSelector.js';
import {initRepoSettingBranches} from './repo-settings.js';
import {initRepoPullRequestMergeForm} from './repo-issue-pr-form.js';
import {initRepoPullRequestCommitStatus} from './repo-issue-pr-status.js';
} from './common.js';
import {initCitationFileCopyContent} from '../features/citation.js';
import {initCompLabelEdit} from '../comp/LabelEdit.js';
import {initRepoDiffConversationNav} from './diff.js';
import {initCompReactionSelector} from '../comp/ReactionSelector.js';
import {initRepoSettingBranches} from './settings.js';
import {initRepoPullRequestMergeForm} from './issue-pr-form.js';
import {initRepoPullRequestCommitStatus} from './issue-pr-status.js';
import {hideElem, showElem} from '../utils/dom.js';
import {POST} from '../modules/fetch.js';
import {initRepoIssueCommentEdit} from './repo-issue-edit.js';
import {initRepoIssueCommentEdit} from './issue-edit.js';

// if there are draft comments, confirm before reloading, to avoid losing comments
function reloadConfirmDraftComment() {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {hideElem, showElem} from '../utils/dom.js';
import {initComboMarkdownEditor} from './comp/ComboMarkdownEditor.js';
import {initComboMarkdownEditor} from '../comp/ComboMarkdownEditor.js';

export function initRepoRelease() {
document.addEventListener('click', (e) => {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import $ from 'jquery';
import {minimatch} from 'minimatch';
import {createMonaco} from './codeeditor.js';
import {createMonaco} from '../features/codeeditor.js';
import {onInputDebounce, toggleElem} from '../utils/dom.js';
import {POST} from '../modules/fetch.js';

Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions web_src/js/features/repo-wiki.js → web_src/js/repo/wiki.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {initMarkupContent} from '../markup/content.js';
import {validateTextareaNonEmpty, initComboMarkdownEditor} from './comp/ComboMarkdownEditor.js';
import {fomanticMobileScreen} from '../modules/fomantic.js';
import {validateTextareaNonEmpty, initComboMarkdownEditor} from '../comp/ComboMarkdownEditor.js';
import {fomanticMobileScreen} from '../fomantic/index.js';
import {POST} from '../modules/fetch.js';

async function initRepoWikiFormEditor() {
Expand Down