From e3043fddcaf5e3ea4beb022c04d411661a3499bd Mon Sep 17 00:00:00 2001
From: ulrich <undisclosed>
Date: Tue, 14 Mar 2017 14:27:13 +0000
Subject: [PATCH] Syntax-Check fuer Java, Gutter Marker fuer Fehler, Tooltips fuer Fehlermeldungen
---
web/ui/ui.js | 186 ++++++++++++++++++++++++++++++++--------------
1 files changed, 128 insertions(+), 58 deletions(-)
diff --git a/web/ui/ui.js b/web/ui/ui.js
index 4d69657..997e9ee 100644
--- a/web/ui/ui.js
+++ b/web/ui/ui.js
@@ -29,6 +29,9 @@
var cutCopyFiles;
var cutCopyOperation;
var loc;
+var PERS_DIR = "Persoenlich";
+var PUB_DIR = "Oeffentlich";
+var compilerIssues;
function fm_init() {
$("#mce-editor").hide();
@@ -55,6 +58,7 @@
$('#m-paste').on('click', fm_menu_paste);
$('#m-shrink').on('click', fm_menu_shrink);
$('#m-test').on('click', fm_menu_test);
+ $('#m-test-2').on('click', fm_menu_test_2);
$('#saveModal').on('hidden.bs.modal', function (e) {
$('#modal_ok').attr('onclick','').unbind('click');
});
@@ -86,10 +90,10 @@
function fm_get_path(uid) {
//console.log('pfad: ' + pfad);
var restdir;
- if(pfad.indexOf('Oeffentlich') > -1) {
- restdir = pfad.substr('Oeffentlich'.length);
- } else if(pfad.indexOf('Persoenlicher Ordner') > -1) {
- restdir = pfad.substr('Persoenlicher Ordner'.length);
+ if(pfad.indexOf(PUB_DIR) > -1) {
+ restdir = pfad.substr(PUB_DIR.length);
+ } else if(pfad.indexOf(PERS_DIR) > -1) {
+ restdir = pfad.substr(PERS_DIR.length);
}
if(restdir !== undefined && restdir.startsWith('/')) {
restdir = restdir.substr(1);
@@ -106,9 +110,9 @@
function fm_get_base(uid) {
//console.log('pfad: ' + pfad);
var pdir;
- if(pfad.indexOf('Oeffentlich') > -1) {
+ if(pfad.indexOf(PUB_DIR) > -1) {
pdir = '/data/';
- } else if(pfad.indexOf('Persoenlicher Ordner') > -1) {
+ } else if(pfad.indexOf(PERS_DIR) > -1) {
pdir = '/home/';
}
//console.log('base: ' + pdir + uid);
@@ -117,6 +121,7 @@
function fm_dok_editor_init(uid) {
var base = fm_get_path(uid);
+ edCount = 0;
//console.log("calling tinymce.init with base: " + base + "/");
/*
@@ -136,6 +141,7 @@
*/
tinymce.init({
content_css : "/file-cms/ui/mce.css",
+ //content_css: "/jslib/bootstrap/css/bootstrap.min.css",
selector: "textarea.text-editor",
statusbar: false,
menubar: false,
@@ -220,8 +226,13 @@
}
function fm_menu_delete() {
$('#confirmOk').click(function() {
+ $('#confirmOk').attr('onclick','').unbind('click');
fm_del_files();
});
+ $('#confirmOk').text("Loeschen");
+ $('#confirmOk').removeClass('btn-primary');
+ $('#confirmOk').addClass('btn-danger');
+ $('#confirmClose').hide();
$('#confirmModalTitle').text("Löschen");
$('#confirmModalBody').text("Wirklich löschen?");
$('#confirmModal').modal({
@@ -267,6 +278,31 @@
}
}
+function fm_menu_test_2() {
+ var liste = fm_gewaehlte_dateien();
+ var m = '?c=de.uhilger.filecms.api.CompileService&m=compile&p=' + pfad + '&p=' + encodeURIComponent(liste);
+ var u = '../svc' + m;
+ fm_get(u, "json", function(resp) {
+ cm.clearGutter("breakpoints");
+
+ if(resp.List[0].CompilerIssue !== undefined) {
+ if(resp.List[0].CompilerIssue instanceof Array) {
+ var issueNo = 0;
+ while(issueNo < resp.List[0].CompilerIssue.length) {
+ // console.log(resp.List[0].CompilerIssue[issueNo].kind);
+ // console.log(resp.List[0].CompilerIssue[issueNo].lineNumber);
+ // console.log(resp.List[0].CompilerIssue[issueNo].sourceName);
+ // console.log(resp.List[0].CompilerIssue[issueNo].message);
+ fm_set_code_marker(resp.List[0].CompilerIssue[issueNo].lineNumber, resp.List[0].CompilerIssue[issueNo].kind + ' ' + resp.List[0].CompilerIssue[issueNo].message);
+ issueNo++;
+ }
+ } else {
+ fm_set_code_marker(resp.List[0].CompilerIssue.lineNumber, resp.List[0].CompilerIssue.kind + ' ' + resp.List[0].CompilerIssue.message);
+ }
+ }
+ });
+}
+
function fm_ansicht_umschalten() {
if($('#ansicht').children(0).hasClass('fa-th-list')) {
$('#ansicht').children(0).addClass('fa-th-large');
@@ -299,6 +335,49 @@
}
function fm_menu_datei_schliessen() {
+ if(openEditor === 'text') {
+ if(!cm.getDoc().isClean()) {
+ fm_ask_for_save();
+ } else {
+ fm_do_close();
+ }
+ } else {
+ if(tinymce.activeEditor.undoManager.hasUndo()) {
+ fm_ask_for_save();
+ } else {
+ fm_do_close();
+ }
+ }
+}
+
+function fm_ask_for_save() {
+ // hier Abfrage ob gespeichert werden soll
+ $('#confirmOk').click(function() {
+ $('#confirmOk').attr('onclick','').unbind('click');
+ fm_menu_datei_speichern(function() {
+ fm_do_close();
+ });
+ });
+ $('#confirmCancel').click(function() {
+ $('#confirmCancel').attr('onclick','').unbind('click');
+ });
+ $('#confirmClose').show();
+ $('#confirmClose').click(function() {
+ $('#confirmClose').attr('onclick','').unbind('click');
+ fm_do_close();
+ });
+ $('#confirmOk').text("Speichern");
+ $('#confirmOk').addClass('btn-primary');
+ $('#confirmOk').removeClass('btn-danger');
+ $('#confirmModalTitle').text("Schliessen");
+ $('#confirmModalBody').text("Speichern vor dem Schliessen?");
+ $('#confirmModal').modal({
+ keyboard: false,
+ show: true
+ });
+}
+
+function fm_do_close() {
$('.codeeditor-space').hide();
$('.code-editor-container').hide();
$("#mce-editor").hide();
@@ -421,7 +500,6 @@
fm_get(u, "text", function(resp) {
userid = resp;
$('#userMenu').text(resp);
- //fm_dok_editor_init(resp);
});
}
@@ -707,34 +785,43 @@
});
}
-function fm_menu_datei_speichern() {
+function fm_menu_datei_speichern(callback) {
//var fname = $('.datei-gewaehlt').text();
var fname = openFileName;
if(fname !== undefined && fname !== '') {
- fm_save_file(fname, 'saveTextFile');
+ fm_save_file(fname, 'saveTextFile', callback);
} else {
- fm_menu_datei_speichern_unter();
+ fm_menu_datei_speichern_unter(callback);
}
}
-function fm_save_file(saveFileName, method) {
+function fm_save_file(saveFileName, method, callback) {
var content;
if(openEditor === 'text') {
content = cm.getValue();
+ cm.getDoc().markClean();
} else {
content = ed.getContent();
+ tinymce.activeEditor.undoManager.clear();
}
var m = '?c=de.uhilger.filecms.api.FileMgr&m=' + method;
var u = '../svc' + m;
fm_post(u, {p1: pfad, p2: saveFileName, p3: content}, function(resp) {
- openFileName = saveFileName;
+ // hier scheint nichts zurueckzukommen..
});
+ openFileName = saveFileName;
+ if(typeof (callback) !== 'function') {
+
+ } else {
+ callback();
+ }
}
-function fm_menu_datei_speichern_unter() {
+function fm_menu_datei_speichern_unter(callback) {
$('#modal_ok').click(function() {
+ $('#modal_ok').attr('onclick','').unbind('click');
// hier speichern
- fm_save_file($('#dateiname').val(), 'saveTextFileAs');
+ fm_save_file($('#dateiname').val(), 'saveTextFileAs', callback);
});
$('#saveModalTitle').text('Datei speichern');
$('#dialogfrage').text("Dateiname?");
@@ -772,8 +859,10 @@
function fm_code_edit(content, m) {
cm = CodeMirror.fromTextArea(document.getElementById("editspace"), {
lineNumbers: true,
+ gutters: ["CodeMirror-linenumbers", "breakpoints"],
mode: m,
viewportMargin : Infinity,
+ tabSize: 2,
extraKeys: {
"F9": function(cm) {
cm.setOption("fullScreen", !cm.getOption("fullScreen"));
@@ -786,6 +875,31 @@
//cm.setValue(htmlDecode(content));
//cm.setValue(content);
cm.setValue(unescapeHtml(content));
+ cm.getDoc().markClean();
+ cm.on("gutterClick", function(theEditor, lineNumber) {
+ var info = theEditor.lineInfo(lineNumber);
+ //--lineNumber;
+ //console.log(info.gutterMarkers.breakpoints.message);
+ //var marker = info.gutterMarkers.breakpoints;
+ //$(marker).tooltip('toggle');
+ });
+}
+
+function fm_set_code_marker(lineNumber, message) {
+ cm.setGutterMarker(lineNumber-1, "breakpoints", makeMarker(message));
+}
+
+function makeMarker(msg) {
+ var marker = document.createElement("div");
+ marker.style.color = "#822";
+ marker.innerHTML = "●";
+ //marker.message = msg;
+ $(marker).tooltip({
+ placement: 'right',
+ title: msg,
+ offset: '10 -10'
+ });
+ return marker;
}
@@ -908,50 +1022,6 @@
return imgurl;
};
-
- /*
- this.kachel = function() {
- var htm;
- var fnx; // = self.fileName;
- var namen = self.fr.absolutePath.split('/');
- if(namen.length > 0) {
- fnx = decodeURIComponent(namen[namen.length - 1]);
- } else {
- fnx = decodeURIComponent(self.fr.absolutePath);
- }
-
-
- if(fnx.indexOf('.jpg') > -1 || fnx.indexOf('.png') > -1 || fnx.indexOf('.gif') > -1 || fnx.indexOf('.jpeg') > -1) {
- var userid = $('#userMenu').text();
- var ext = '';
- var dotpos = fnx.indexOf('.');
- if(dotpos > -1) {
- fnx = fnx.substring(0, dotpos);
- ext = fnx.substr(dotpos);
- }
- var path = fm_get_path(userid);
- var imgurl = path + '/' + fnx + '_tn' + ext;
- htm = "img src='" + imgurl + "'";
- } else {
- var cl;
- if(modus == 'kacheln') {
- if(self.fr.isDirectory) {
- cl = 'fa-folder ordner';
- } else {
- cl = 'fa-file datei';
- }
- } else {
- if(self.fr.isDirectory) {
- cl = 'fa-folder ordner';
- } else {
- cl = 'fa-file-o datei';
- }
- }
- htm = "i class='fa " + cl + " fa-3x'></i";
- }
- return htm;
- };
- */
this.fileName = function() {
--
Gitblit v1.9.3