From 64d8b9925e9a832631dc8983f03927a8928e0e42 Mon Sep 17 00:00:00 2001 From: ulrich <undisclosed> Date: Tue, 14 Mar 2017 15:53:55 +0000 Subject: [PATCH] Marker setzen bereinigt --- web/ui/ui.js | 39 ++++++++++++++++++++++++++++++--------- 1 files changed, 30 insertions(+), 9 deletions(-) diff --git a/web/ui/ui.js b/web/ui/ui.js index 997e9ee..b54d20a 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)); } } }); @@ -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"), { @@ -869,6 +877,20 @@ }, "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; } } }); @@ -883,10 +905,11 @@ //var marker = info.gutterMarkers.breakpoints; //$(marker).tooltip('toggle'); }); -} - -function fm_set_code_marker(lineNumber, message) { - cm.setGutterMarker(lineNumber-1, "breakpoints", makeMarker(message)); + /* + cm.on("keyHandled", function(theEditor, keyName, event){ + console.log('cm.keyHandled keyName: ' + keyName + ', event.type: ' + event.type); + }); + */ } function makeMarker(msg) { @@ -897,12 +920,10 @@ $(marker).tooltip({ placement: 'right', title: msg, - offset: '10 -10' + offset: '0 -30' }); return marker; } - - /* -------- helper functions ----------- */ -- Gitblit v1.9.3