From 972e946a9836c2909a8318587beeb9bee6631573 Mon Sep 17 00:00:00 2001 From: ulrich <not disclosed> Date: Wed, 15 Mar 2017 17:07:50 +0000 Subject: [PATCH] CATALINA_BASE_FOLDER (erste Versuche) --- web/ui/ui.js | 35 +++++++++++++++++++++++++---------- 1 files changed, 25 insertions(+), 10 deletions(-) diff --git a/web/ui/ui.js b/web/ui/ui.js index 6d66b5c..3cceaaf 100644 --- a/web/ui/ui.js +++ b/web/ui/ui.js @@ -286,6 +286,8 @@ 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) { @@ -293,11 +295,15 @@ // 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); + 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 { - fm_set_code_marker(resp.List[0].CompilerIssue.lineNumber, resp.List[0].CompilerIssue.kind + ' ' + resp.List[0].CompilerIssue.message); + lno = resp.List[0].CompilerIssue.lineNumber; + eMsg = resp.List[0].CompilerIssue.kind + ' ' + resp.List[0].CompilerIssue.message; + cm.setGutterMarker(lno-1, "breakpoints", makeMarker(eMsg)); } } }); @@ -567,7 +573,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?"); @@ -852,9 +858,11 @@ /* ---- codemirror editor handling -------- */ +/* function htmlDecode(value){ return $('<div/>').html(value).text(); } +*/ function fm_code_edit(content, m) { cm = CodeMirror.fromTextArea(document.getElementById("editspace"), { @@ -872,6 +880,17 @@ }, ".": 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; } } }); @@ -886,13 +905,11 @@ //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); + console.log('cm.keyHandled keyName: ' + keyName + ', event.type: ' + event.type); }); -} - -function fm_set_code_marker(lineNumber, message) { - cm.setGutterMarker(lineNumber-1, "breakpoints", makeMarker(message)); + */ } function makeMarker(msg) { @@ -907,8 +924,6 @@ }); return marker; } - - /* -------- helper functions ----------- */ -- Gitblit v1.9.3