fix

Author: kerwin612

modules/templates/util_render.go

@@ -181,7 +181,15 @@ func (ut *RenderUtils) RenderLabel(label *issues_model.Label) template.HTML {
 		textColor, itemColor, itemHTML)
 }
 
-func (ut *RenderUtils) RenderFolderIconByOpenState(isOpen bool) template.HTML {
+func (ut *RenderUtils) RenderExpandedFolderIcon() template.HTML {
+	return ut.RenderFolderIconByExpansionState(true)
+}
+
+func (ut *RenderUtils) RenderCollapsedFolderIcon() template.HTML {
+	return ut.RenderFolderIconByExpansionState(false)
+}
+
+func (ut *RenderUtils) RenderFolderIconByExpansionState(isOpen bool) template.HTML {
 	if setting.UI.FileIconTheme == "material" {
 		return fileicon.DefaultMaterialIconProvider().FolderIcon(ut.ctx, isOpen)
 	}

templates/admin/repo/unadopted.tmpl

@@ -21,7 +21,7 @@
 					<div class="ui aligned divided list">
 						{{range $dirI, $dir := .Dirs}}
 							<div class="item tw-flex tw-items-center">
-								<span class="tw-flex-1"> {{ctx.RenderUtils.RenderFolderIconByOpenState false}} {{$dir}}</span>
+								<span class="tw-flex-1"> {{ctx.RenderUtils.RenderCollapsedFolderIcon}} {{$dir}}</span>
 								<div>
 									<button class="ui button primary show-modal tw-p-2" data-modal="#adopt-unadopted-modal-{{$dirI}}">{{svg "octicon-plus"}} {{ctx.Locale.Tr "repo.adopt_preexisting_label"}}</button>
 									<div class="ui g-modal-confirm modal" id="adopt-unadopted-modal-{{$dirI}}">

templates/repo/diff/box.tmpl

@@ -15,8 +15,9 @@
 					const diffTreeIcon = `.octicon-sidebar-${diffTreeVisible ? 'expand' : 'collapse'}`;
 					diffTreeBtn.querySelector(diffTreeIcon).classList.remove('tw-hidden');
 					diffTreeBtn.setAttribute('data-tooltip-content', diffTreeBtn.getAttribute(diffTreeVisible ? 'data-hide-text' : 'data-show-text'));
-					window.config.pageData.folderIcon = {{ctx.RenderUtils.RenderFolderIconByOpenState false}};
-					window.config.pageData.openFolderIcon = {{ctx.RenderUtils.RenderFolderIconByOpenState true}};
+
+					window.config.pageData.expandedFolderIcon = {{ctx.RenderUtils.RenderExpandedFolderIcon}};
+					window.config.pageData.collapsedFolderIcon = {{ctx.RenderUtils.RenderCollapsedFolderIcon}};
 				</script>
 			{{end}}
 			{{if not .DiffNotAvailable}}

templates/repo/view.tmpl

@@ -1,7 +1,7 @@
 {{template "base/head" .}}
 <script type="module">
-window.config.pageData.folderIcon = {{ctx.RenderUtils.RenderFolderIconByOpenState false}};
-window.config.pageData.openFolderIcon = {{ctx.RenderUtils.RenderFolderIconByOpenState true}};
+window.config.pageData.expandedFolderIcon = {{ctx.RenderUtils.RenderExpandedFolderIcon}};
+window.config.pageData.collapsedFolderIcon = {{ctx.RenderUtils.RenderCollapsedFolderIcon}};
 </script>
 <div role="main" aria-label="{{.Title}}" class="page-content repository file list {{if .IsBlame}}blame{{end}}">
 	{{template "repo/header" .}}

templates/repo/view_list.tmpl

@@ -6,7 +6,7 @@
 	</div>
 	{{if .HasParentPath}}
 	<a class="repo-file-line parent-link silenced" href="{{.BranchLink}}{{if .ParentPath}}{{PathEscapeSegments .ParentPath}}{{end}}">
-		{{ctx.RenderUtils.RenderFolderIconByOpenState false}} ..
+		{{ctx.RenderUtils.RenderCollapsedFolderIcon}} ..
 	</a>
 	{{end}}
 	{{range $item := .Files}}

templates/user/settings/repos.tmpl

@@ -30,7 +30,7 @@
 											<span><a href="{{$repo.BaseRepo.Link}}">{{$repo.BaseRepo.OwnerName}}/{{$repo.BaseRepo.Name}}</a></span>
 										{{end}}
 									{{else}}
-										<span class="icon tw-inline-block tw-pt-2">{{ctx.RenderUtils.RenderFolderIconByOpenState false}}</span>
+										<span class="icon tw-inline-block tw-pt-2">{{ctx.RenderUtils.RenderCollapsedFolderIcon}}</span>
 										<span class="name tw-inline-block tw-pt-2">{{$.ContextUser.Name}}/{{$dir}}</span>
 										<div class="tw-float-right">
 											{{if $.allowAdopt}}

web_src/js/components/DiffFileTreeItem.vue

@@ -47,9 +47,7 @@ function getIconForDiffStatus(pType: FileStatus) {
       <!-- directory -->
       <SvgIcon :name="collapsed ? 'octicon-chevron-right' : 'octicon-chevron-down'"/>
       <!-- eslint-disable-next-line vue/no-v-html -->
-      <span v-if="collapsed" class="item-icon" v-html="pageData.folderIcon"/>
-      <!-- eslint-disable-next-line vue/no-v-html -->
-      <span v-else class="item-icon" v-html="pageData.openFolderIcon"/>
+      <span class="item-icon" v-html="collapsed ? pageData.collapsedFolderIcon : pageData.expandedFolderIcon"/>
       <span class="gt-ellipsis">{{ item.name }}</span>
     </div>
 

web_src/js/components/ViewFileTreeItem.vue

@@ -86,9 +86,7 @@ onMounted(async () => {
     </div>
     <div class="item-content">
       <!-- eslint-disable-next-line vue/no-v-html -->
-      <span v-if="isDirectory && collapsed" class="item-icon" v-html="pageData.folderIcon"/>
-      <!-- eslint-disable-next-line vue/no-v-html -->
-      <span v-else-if="isDirectory && !collapsed" class="item-icon" v-html="pageData.openFolderIcon"/>
+      <span v-if="isDirectory" class="item-icon" v-html="collapsed ? pageData.collapsedFolderIcon : pageData.expandedFolderIcon"/>
       <!-- eslint-disable-next-line vue/no-v-html -->
       <span v-else class="item-icon" v-html="item.fileIcon"/>
       <span class="gt-ellipsis tw-flex-1">{{ item.entryName }}</span>