From e383f14455a77ad51d21c8ebcca482d968c74c00 Mon Sep 17 00:00:00 2001
From: ulrich <undisclosed>
Date: Fri, 17 Mar 2017 07:49:16 +0000
Subject: [PATCH] Lightbox hinzugefuegt
---
web/ui/ui.js | 158 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 129 insertions(+), 29 deletions(-)
diff --git a/web/ui/ui.js b/web/ui/ui.js
index 5b30784..0fd2167 100644
--- a/web/ui/ui.js
+++ b/web/ui/ui.js
@@ -31,6 +31,7 @@
var loc;
var PERS_DIR = "Persoenlich";
var PUB_DIR = "Oeffentlich";
+var compilerIssues;
function fm_init() {
$("#mce-editor").hide();
@@ -57,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');
});
@@ -139,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,
@@ -275,6 +278,46 @@
}
}
+function fm_menu_test_2() {
+ fm_compile('0', fm_mark_compile_results_in_editor);
+}
+
+function fm_mark_compile_results_in_editor(resp) {
+ cm.clearGutter("breakpoints");
+
+ if(resp.List[0].CompilerIssue !== undefined) {
+ var lno;
+ var eMsg;
+ 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);
+ lno = resp.List[0].CompilerIssue[issueNo].lineNumber;
+ eMsg = resp.List[0].CompilerIssue[issueNo].kind + ' ' + resp.List[0].CompilerIssue[issueNo].message;
+ cm.setGutterMarker(lno-1, "breakpoints", makeMarker(eMsg));
+ issueNo++;
+ }
+ } else {
+ lno = resp.List[0].CompilerIssue.lineNumber;
+ eMsg = resp.List[0].CompilerIssue.kind + ' ' + resp.List[0].CompilerIssue.message;
+ cm.setGutterMarker(lno-1, "breakpoints", makeMarker(eMsg));
+ }
+ }
+}
+
+function fm_compile(modeStr, callback) {
+ var liste = fm_gewaehlte_dateien();
+ var m = '?c=de.uhilger.filecms.api.CompileService&m=compile&p=' + pfad + '&p=' + encodeURIComponent(liste) +
+ '&p=' + modeStr;
+ var u = '../svc' + m;
+ fm_get(u, "json", function(resp) {
+ callback(resp);
+ });
+}
+
function fm_ansicht_umschalten() {
if($('#ansicht').children(0).hasClass('fa-th-list')) {
$('#ansicht').children(0).addClass('fa-th-large');
@@ -307,34 +350,46 @@
}
function fm_menu_datei_schliessen() {
- if(tinymce.activeEditor.undoManager.hasUndo()) {
- // 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');
+ 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();
});
- $('#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
- });
- } else {
+ });
+ $('#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() {
@@ -527,7 +582,7 @@
$('#modal_ok').click(function() {
// hier umbenennen
- fm_rename_file(fname, pfad, $('#dateiname').val())
+ fm_rename_file(fname, pfad, $('#dateiname').val());
});
$('#saveModalTitle').text('Datei umbenennen');
$('#dialogfrage').text("Neuer Dateiname?");
@@ -759,17 +814,20 @@
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) {
// hier scheint nichts zurueckzukommen..
});
- tinymce.activeEditor.undoManager.clear();
openFileName = saveFileName;
- if(callback !== undefined) {
+ if(typeof (callback) !== 'function') {
+
+ } else {
callback();
}
}
@@ -809,30 +867,72 @@
/* ---- codemirror editor handling -------- */
+/*
function htmlDecode(value){
return $('<div/>').html(value).text();
}
+*/
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"));
},
"Esc": function(cm) {
if (cm.getOption("fullScreen")) cm.setOption("fullScreen", false);
+ },
+ ".": function(cm) {
+ console.log('dot pressed: perhaps look up class or method name');
+ /*
+ * Hier kann man eine Funktion ausloesen, die fuer das
+ * Wort vor dem Punkt (Name der Klasse) eine Liste mit
+ * Vorschlaegen fuer Methodennamen einblendet.
+ */
+
+ /*
+ * CodeMirror.Pass laesst das Zeichen zum Editorinhalt durch,
+ * verhindert aber das Ausloesen von 'keyHandled'
+ */
+ return CodeMirror.Pass;
}
}
});
//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');
+ });
+ /*
+ cm.on("keyHandled", function(theEditor, keyName, event){
+ console.log('cm.keyHandled keyName: ' + keyName + ', event.type: ' + event.type);
+ });
+ */
}
-
+function makeMarker(msg) {
+ var marker = document.createElement("div");
+ marker.style.color = "#822";
+ marker.innerHTML = "●";
+ //marker.message = msg;
+ $(marker).tooltip({
+ placement: 'right',
+ title: msg,
+ offset: '0 -30'
+ });
+ return marker;
+}
/* -------- helper functions ----------- */
--
Gitblit v1.9.3