fine tune

Author: wxiaoguang

routers/web/repo/view_file.go

@@ -225,12 +225,11 @@ func prepareFileView(ctx *context.Context, entry *git.TreeEntry) {
 		return
 	}
 
-	isRepresentableAsText := fInfo.st.IsRepresentableAsText()
 	ctx.Data["IsLFSFile"] = fInfo.isLFSFile()
 	ctx.Data["FileSize"] = fInfo.fileSize
-	ctx.Data["IsRepresentableAsText"] = isRepresentableAsText
+	ctx.Data["IsRepresentableAsText"] = fInfo.st.IsRepresentableAsText()
 	ctx.Data["IsExecutable"] = entry.IsExecutable()
-	ctx.Data["CanCopyContent"] = isRepresentableAsText
+	ctx.Data["CanCopyContent"] = fInfo.st.IsRepresentableAsText() || fInfo.st.IsImage()
 
 	attrs, ok := prepareFileViewLfsAttrs(ctx)
 	if !ok {

templates/repo/view_file.tmpl

@@ -59,7 +59,7 @@
 				</div>
 				<a download class="btn-octicon" data-tooltip-content="{{ctx.Locale.Tr "repo.download_file"}}" href="{{$.RawFileLink}}">{{svg "octicon-download"}}</a>
 				<a class="btn-octicon {{if not .CanCopyContent}}disabled{{end}}" data-global-click="onCopyContentButtonClick"
-					{{if or .IsImageFile (and .IsRepresentableAsText (not .IsDisplayingSource))}}data-raw-link="{{$.RawFileLink}}"{{end}}
+					{{if not .IsDisplayingSource}}data-raw-file-link="{{$.RawFileLink}}"{{end}}
 					data-tooltip-content="{{if .CanCopyContent}}{{ctx.Locale.Tr "copy_content"}}{{else}}{{ctx.Locale.Tr "copy_type_unsupported"}}{{end}}"
 				>{{svg "octicon-copy"}}</a>
 				{{if .EnableFeed}}

web_src/js/features/copycontent.ts

@@ -9,17 +9,17 @@ const {i18n} = window.config;
 export function initCopyContent() {
   registerGlobalEventFunc('click', 'onCopyContentButtonClick', async (btn: HTMLElement) => {
     if (btn.classList.contains('disabled') || btn.classList.contains('is-loading')) return;
-    const rawLink = btn.getAttribute('data-raw-link');
+    const rawFileLink = btn.getAttribute('data-raw-file-link');
 
     let content, isRasterImage = false;
 
     // when "data-raw-link" is present, we perform a fetch. this is either because
     // the text to copy is not in the DOM, or it is an image that should be
     // fetched to copy in full resolution
-    if (rawLink) {
+    if (rawFileLink) {
       btn.classList.add('is-loading', 'loading-icon-2px');
       try {
-        const res = await GET(rawLink, {credentials: 'include', redirect: 'follow'});
+        const res = await GET(rawFileLink, {credentials: 'include', redirect: 'follow'});
         const contentType = res.headers.get('content-type');
 
         if (contentType.startsWith('image/') && !contentType.startsWith('image/svg')) {

web_src/js/render/plugins/3d-viewer-test-cube.stl

@@ -2,6 +2,20 @@ import type {FileRenderPlugin} from '../plugin.ts';
 import {extname} from '../../utils.ts';
 
 // support common 3D model file formats, use online-3d-viewer library for rendering
+
+// eslint-disable-next-line multiline-comment-style
+/* a simple text STL file example:
+solid SimpleTriangle
+  facet normal 0 0 1
+    outer loop
+      vertex 0 0 0
+      vertex 1 0 0
+      vertex 0 1 0
+    endloop
+  endfacet
+endsolid SimpleTriangle
+*/
+
 export function newRenderPlugin3DViewer(): FileRenderPlugin {
   // Some extensions are text-based formats:
   // .3mf .amf .brep: XML
@@ -28,7 +42,6 @@ export function newRenderPlugin3DViewer(): FileRenderPlugin {
 
     async render(container: HTMLElement, fileUrl: string): Promise<void> {
       const OV = await import(/* webpackChunkName: "online-3d-viewer" */'online-3d-viewer');
-      container.classList.add('model3d-content');
       const viewer = new OV.EmbeddedViewer(container, {
         backgroundColor: new OV.RGBAColor(59, 68, 76, 0),
         defaultColor: new OV.RGBColor(65, 131, 196),