From f23f2b611c8670bb9da8e6ddd32d3755289166c2 Mon Sep 17 00:00:00 2001 From: ulrich <not disclosed> Date: Sun, 19 Mar 2017 16:33:35 +0000 Subject: [PATCH] compileAll (Entwurf) aufgeraeumt --- web/ui/ui.js | 56 ++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 48 insertions(+), 8 deletions(-) diff --git a/web/ui/ui.js b/web/ui/ui.js index 977ea1c..8182c68 100644 --- a/web/ui/ui.js +++ b/web/ui/ui.js @@ -33,6 +33,7 @@ var PUB_DIR = "Oeffentlich"; var BASE_DIR = "$basis"; var DATA_DIR = "$daten"; +var WWW_DIR = "www"; var compilerIssues; function fm_init() { @@ -60,7 +61,8 @@ $('#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); + $('#m-test-2').on('click', fm_menu_compile); + $('#m-test-3').on('click', fm_menu_compile_all); $('#saveModal').on('hidden.bs.modal', function (e) { $('#modal_ok').attr('onclick','').unbind('click'); }); @@ -103,9 +105,12 @@ } if(restdir !== undefined && restdir.startsWith('/')) { restdir = restdir.substr(1); + if(restdir.indexOf(WWW_DIR) > -1) { + restdir = restdir.replace(WWW_DIR, 'data'); + } } var pdir = fm_get_base(uid); - //console.log('path: ' + pdir + "/" + restdir); + // console.log('fm_get_path path: ' + pdir + "/" + restdir); if(restdir.length > 1) { return pdir + "/" + restdir; } else { @@ -117,18 +122,22 @@ //console.log('pfad: ' + pfad); var pdir; if(pfad.indexOf(PUB_DIR) > -1) { - pdir = '/data/'; + pdir = '/data/' + uid; } else if(pfad.indexOf(PERS_DIR) > -1) { - pdir = '/home/'; + pdir = '/home/' + uid; + } else if(pfad.indexOf(BASE_DIR) > -1) { + pdir = ''; + } else if(pfad.indexOf(DATA_DIR) > -1) { + pdir = ''; } - //console.log('base: ' + pdir + uid); - return pdir + uid; + //console.log('fm_get_base base: ' + pdir + uid); + return pdir; } function fm_dok_editor_init(uid) { var base = fm_get_path(uid); edCount = 0; - //console.log("calling tinymce.init with base: " + base + "/"); + //console.log("fm_dok_editor_init calling tinymce.init with base: " + base + "/"); /* * vgl. @@ -164,6 +173,8 @@ importcss_append: true, width: "100%", height: '100%', + relative_urls : true, + convert_urls : false, document_base_url : base + "/", setup: function (editor) { ed = editor; @@ -284,8 +295,11 @@ } } -function fm_menu_test_2() { +function fm_menu_compile() { fm_compile('0', fm_mark_compile_results_in_editor); +} +function fm_menu_compile_all() { + fm_compile_all(); } function fm_mark_compile_results_in_editor(resp) { @@ -314,6 +328,32 @@ } } +function fm_compile_all() { + var m = '?c=de.uhilger.filecms.api.CompileService&m=compileAll&p=' + pfad; + var u = '../svc' + m; + fm_get(u, "json", function(resp) { + 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(' +++ ---- +++ '); + 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); + issueNo++; + } + } else { + lno = resp.List[0].CompilerIssue.lineNumber; + eMsg = resp.List[0].CompilerIssue.kind + ' ' + resp.List[0].CompilerIssue.message; + console.log(lno + ' ' + 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) + -- Gitblit v1.9.3