improve text editor

Author: JojiiOfficial

handlers/web/PreviewHandler.go

@@ -4,6 +4,7 @@ import (
 	"html/template"
 	"net/http"
 	"path"
+	"path/filepath"
 	"strings"
 
 	"github.com/DataManager-Go/DataManagerServer/models"
@@ -75,13 +76,32 @@ func PrevievFileHandler(handlerData HandlerData, w http.ResponseWriter, r *http.
 		Encrypted:      (file.Encryption.Valid && libdm.EncryptionIValid(file.Encryption.Int32)),
 		MimeType:       file.FileType,
 		Scheme:         scheme,
+		Lang:           getLang(file.Name),
 	}
 
 	//Serve preview
 	LogError(servePreviewTemplate(handlerData.Config, w, templateData))
 	return nil
 }
 
+func getLang(ext string) string {
+	ext = strings.ToLower(filepath.Ext(ext))
+	if len(ext) < 2 {
+		return ""
+	}
+
+	if strings.HasPrefix(ext, ".") {
+		ext = ext[1:]
+	}
+
+	switch ext {
+	case "go":
+		return "golang"
+	default:
+		return ""
+	}
+}
+
 func servePreviewTemplate(config *models.Config, w http.ResponseWriter, data interface{}) error {
 	PreviewFile := config.GetTemplateFile(PreviewFile)
 	ContentFile := config.GetTemplateFile(ContentFile)

html/templates/Content.html

@@ -45,7 +45,7 @@
             var newHeight =
                 editor.getSession().getScreenLength()
                 * editor.renderer.lineHeight
-                + editor.renderer.scrollBar.getWidth();
+                + editor.renderer.scrollBar.getWidth()+1;
 
             $('#editor').height(newHeight.toString() + "px");
             $('#editor-section').height(newHeight.toString() + "px");

html/templates/Preview.html

@@ -77,7 +77,7 @@
         position: absolute;
         display: inline;
         overflow-y: auto;
-        overflow-x: hidden;
+        overflow-x: none;
         width: 100%;
     }
 
@@ -92,6 +92,7 @@
         bottom: 0;
         width: 100%;
         top: 100px;
+        overflow-x: none;
         z-index: 0;
     }
 
@@ -113,19 +114,30 @@
         box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23);
         -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
     }
+
+    body .ace_editor:hover .ace_scrollbar {
+        display: none;
+    }
 </style>
 
 <!-- Text preview -->
 <script src="/static/preview/ace/ace.js" type="text/javascript" charset="utf-8"></script>
 <script src="/static/preview/ace/theme-nord_dark.js" type="text/javascript" charset="utf-8"></script>
-<script src="/static/preview/ace/mode-golang.js" type="text/javascript" charset="utf-8"></script>
 <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
 
+{{ if not (eq (len .Lang) 0) }}
+<script src="/static/preview/ace/mode-{{.Lang}}.js" type="text/javascript" charset="utf-8"></script>
+{{ end }}
+
 <script>
-    var SyntaxMode = ace.require("ace/mode/golang").Mode;
+    var lang = "{{.Lang}}";
     var editor = ace.edit("editor");
+
     editor.setTheme("ace/theme/nord_dark");
-    editor.session.setMode(new SyntaxMode());
+    if (lang.length != 0) {
+        var SyntaxMode = ace.require("ace/mode/" + lang).Mode;
+        editor.session.setMode(new SyntaxMode());
+    }
 </script>
 {{ end }}
 

models/Preview.go

@@ -36,6 +36,7 @@ type PreviewTemplate struct {
 	Encrypted      bool
 	MimeType       string
 	Scheme         string
+	Lang           string
 }
 
 // PreviewTypeFromMime get Type to preview from mime