From 7b3372525a42997ef9d169969cbe7b0f3196a9c4 Mon Sep 17 00:00:00 2001
From: ulrich <undisclosed>
Date: Tue, 21 Mar 2017 09:58:38 +0000
Subject: [PATCH] Build app
---
web/ui/ui.js | 417 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 390 insertions(+), 27 deletions(-)
diff --git a/web/ui/ui.js b/web/ui/ui.js
index ddf9e16..4e7edbd 100644
--- a/web/ui/ui.js
+++ b/web/ui/ui.js
@@ -28,11 +28,19 @@
var cutCopySrcDir;
var cutCopyFiles;
var cutCopyOperation;
+var loc;
+var PERS_DIR = "Persoenlich";
+var PUB_DIR = "Oeffentlich";
+var BASE_DIR = "$basis";
+var DATA_DIR = "$daten";
+var WWW_DIR = "www";
+var compilerIssues;
function fm_init() {
$("#mce-editor").hide();
$('.codeeditor-space').hide();
$('.code-editor-container').hide();
+ $('.sued').hide();
//$('.ost').attr('flex-basis', 0);
$('#newTextFile').on('click', fm_menu_neue_textdatei);
$('#newDoc').on('click', fm_menu_neues_dokument);
@@ -52,14 +60,28 @@
$('#m-cut').on('click', fm_menu_cut);
$('#m-copy').on('click', fm_menu_copy);
$('#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_compile);
+ $('#m-test-3').on('click', fm_menu_compile_all);
+ $('#m-compile-results').on('click', fm_fusszeile_zeigen);
+ $('#m-build-app').on('click', fm_menu_build_app);
$('#saveModal').on('hidden.bs.modal', function (e) {
$('#modal_ok').attr('onclick','').unbind('click');
});
$('#logout').click(fm_logout);
+ $('#fusszeile-schliessen').on('click', fm_fusszeile_schliessen);
fm_get_login();
fm_get_list('');
fm_init_uploader();
+ /*
+ console.log('href: ' + window.location.href);
+ console.log('host: ' + window.location.host);
+ console.log('hostname: ' + window.location.hostname);
+ console.log('port: ' + window.location.port);
+ console.log('protocol: ' + window.location.protocol);
+ */
+ loc = window.location.protocol + '//' + window.location.host;
}
function fm_resize_editor() {
@@ -73,19 +95,34 @@
}, 200);
}
+function fm_fusszeile_schliessen() {
+ $('.sued').hide();
+}
+
+function fm_fusszeile_zeigen() {
+ $('.sued').show();
+}
+
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);
+ } else if(pfad.indexOf(BASE_DIR) > -1) {
+ restdir = pfad.substr(BASE_DIR.length);
+ } else if(pfad.indexOf(DATA_DIR) > -1) {
+ restdir = pfad.substr(DATA_DIR.length);
}
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 {
@@ -96,18 +133,23 @@
function fm_get_base(uid) {
//console.log('pfad: ' + pfad);
var pdir;
- if(pfad.indexOf('Oeffentlich') > -1) {
- pdir = '/data/';
- } else if(pfad.indexOf('Persoenlicher Ordner') > -1) {
- pdir = '/home/';
+ if(pfad.indexOf(PUB_DIR) > -1) {
+ pdir = '/data/' + uid;
+ } else if(pfad.indexOf(PERS_DIR) > -1) {
+ 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);
- //console.log("calling tinymce.init with base: " + base + "/");
+ edCount = 0;
+ //console.log("fm_dok_editor_init calling tinymce.init with base: " + base + "/");
/*
* vgl.
@@ -126,6 +168,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,
@@ -142,6 +185,8 @@
importcss_append: true,
width: "100%",
height: '100%',
+ relative_urls : true,
+ convert_urls : false,
document_base_url : base + "/",
setup: function (editor) {
ed = editor;
@@ -210,8 +255,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({
@@ -228,6 +278,7 @@
*/
function fm_gewaehlte_dateien() {
var gewaehlte = $('.datei-gewaehlt');
+ /*
//console.log('anzahl: ' + gewaehlte.length);
var fnames = new Array();
var i = 0;
@@ -243,7 +294,27 @@
// {"List":[{"java.lang.String":"test3.txt"},{"java.lang.String":"Test1.txt"},{"java.lang.String":"Test2.txt"}]}
// und wird auf dem Server zu einer List[ArrayList<String>] bei der jede ArrayList<String> nur ein Element hat
return liste;
+ */
+ return fm_dateiliste_bilden(gewaehlte);
}
+
+function fm_dateiliste_bilden(gewaehlte) {
+ var fnames = new Array();
+ var i = 0;
+ while(i < gewaehlte.length) {
+ var str = { "java.lang.String": $(gewaehlte[i]).text()};
+ fnames.push(str);
+ //console.log('loeschen ' + pfad + ' ' + $(gewaehlte[i]).text());
+ //i += 2;
+ i++;
+ }
+ var liste = '{"List":' + JSON.stringify(fnames) + '}';
+ // 'liste' enthaelt:
+ // {"List":[{"java.lang.String":"test3.txt"},{"java.lang.String":"Test1.txt"},{"java.lang.String":"Test2.txt"}]}
+ // und wird auf dem Server zu einer List[ArrayList<String>] bei der jede ArrayList<String> nur ein Element hat
+ return liste;
+}
+
/* --------- Dateifunktionen Ende ---------- */
function fm_menu_test() {
@@ -255,6 +326,122 @@
$('.ost').empty();
$('.ost').width(0);
}
+}
+
+function fm_menu_compile() {
+ fm_compile('0', fm_mark_compile_results_in_editor);
+}
+function fm_menu_compile_all() {
+ fm_compile_all();
+}
+
+function fm_menu_build_app() {
+ fm_build_app();
+}
+
+function fm_mark_compile_results_in_editor(resp) {
+ cm.clearGutter("breakpoints");
+
+ if(resp.List[0].CompilerIssue !== undefined) {
+ cm.setGutterMarker(0, "breakpoints", makeMarker("Code hat Fehler"));
+ 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_build_app() {
+ var m = '?c=de.uhilger.filecms.api.CompileService&m=buildApp&p=' + pfad;
+ var u = '../svc' + m;
+ fm_get(u, "text", function(resp) {
+ $('.system-out').empty();
+ $('.system-out').append('Ergebnis von Build app: ' + resp);
+ fm_fusszeile_zeigen();
+ });
+}
+
+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;
+ var issueList = new Array();
+ if(resp.List[0].CompilerIssue instanceof Array) {
+ var issueNo = 0;
+ while(issueNo < resp.List[0].CompilerIssue.length) {
+ /*
+ $('.system-out').append(' +++ ---- +++ ');
+ $('.system-out').append(resp.List[0].CompilerIssue[issueNo].kind);
+ $('.system-out').append(resp.List[0].CompilerIssue[issueNo].lineNumber);
+ $('.system-out').append(resp.List[0].CompilerIssue[issueNo].sourceName);
+ $('.system-out').append(resp.List[0].CompilerIssue[issueNo].message);
+ */
+ var issue = new CompilerIssue(
+ resp.List[0].CompilerIssue[issueNo].sourceName,
+ resp.List[0].CompilerIssue[issueNo].message,
+ resp.List[0].CompilerIssue[issueNo].kind,
+ resp.List[0].CompilerIssue[issueNo].lineNumber
+ );
+ issueList.push(issue);
+
+ /*
+ 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;
+ //$('.system-out').append(lno + ' ' + eMsg);
+ //console.log(lno + ' ' + eMsg);
+ var issue = new CompilerIssue(
+ resp.List[0].CompilerIssue.sourceName,
+ resp.List[0].CompilerIssue.message,
+ resp.List[0].CompilerIssue.kind,
+ resp.List[0].CompilerIssue.lineNumber
+ );
+ issueList.push(issue);
+ }
+ var theList = new IssueList(issueList);
+ var template = $('#tpl-ci').html();
+ Mustache.parse(template); // optional, speeds up future uses
+ $('.system-out').empty();
+ $('.system-out').html(Mustache.render(template, theList));
+ $('.sued').show();
+ }
+ });
+}
+
+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() {
@@ -289,6 +476,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();
@@ -318,7 +548,7 @@
}
fm_get_list(pfad);
}
- } else if($(elem).children(0).hasClass('fa-file')) {
+ } else if($(elem).children(0).hasClass('datei')) {
if(/*ev.shiftKey || */ ev.ctrlKey) {
// mehrere Dateien sollen gewaehlt werden
} else {
@@ -411,7 +641,6 @@
fm_get(u, "text", function(resp) {
userid = resp;
$('#userMenu').text(resp);
- //fm_dok_editor_init(resp);
});
}
@@ -479,7 +708,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?");
@@ -499,6 +728,18 @@
m = m + '&p=' + p;
m = m + '&p=' + fn;
m = m + '&p=' + neuerName;
+ var u = '../svc' + m;
+ fm_get(u, "text", function(resp) {
+ fm_get_list(pfad);
+ });
+}
+
+function fm_menu_shrink() {
+ var gewaehlte = $('.datei-gewaehlt');
+ var fname = $(gewaehlte[0]).text();
+ var m = '?c=de.uhilger.filecms.api.FileMgr&m=bildVerkleinern';
+ m = m + '&p=' + pfad;
+ m = m + '&p=' + fname;
var u = '../svc' + m;
fm_get(u, "text", function(resp) {
fm_get_list(pfad);
@@ -685,34 +926,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?");
@@ -743,28 +993,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(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 ----------- */
@@ -804,7 +1098,44 @@
return '{"' + obj.constructor.name + '":' + JSON.stringify(obj) + '}';
}
+function escapeHtml(text) {
+ text = text.replace(/\u228/g,'ä');
+ text = text.replace(/\u246/g,'ö');
+ text = text.replace(/\u252/g,'ü');
+ text = text.replace(/\u196/g,'Ä');
+ text = text.replace(/\u214/g,'Ö');
+ text = text.replace(/\u220/g,'Ü');
+ text = text.replace(/\u223/g,'ß');
+ text = text.replace(/\u26/g,'&');
+ return text;
+}
+
+function unescapeHtml(text) {
+ text = text.replace(/ä/g, String.fromCharCode(228));
+ text = text.replace(/ö/g, String.fromCharCode(246));
+ text = text.replace(/ü/g, String.fromCharCode(252));
+ text = text.replace(/Ä/g, String.fromCharCode(196));
+ text = text.replace(/Ö/g, String.fromCharCode(214));
+ text = text.replace(/Ü/g, String.fromCharCode(220));
+ text = text.replace(/ß/g, String.fromCharCode(223));
+ text = text.replace(/&/g, String.fromCharCode(26));
+ return text;
+}
+
+
/* ----- Objekte ----- */
+
+function IssueList(il) {
+ this.issues = il;
+}
+
+function CompilerIssue(sn, ms, ki, ln) {
+ var self = this;
+ this.sourceName = sn;
+ this.message = ms;
+ this.kind = ki;
+ this.lineNumber = ln;
+}
function FileList(fl) {
this.files = fl;
@@ -813,6 +1144,7 @@
function FileRef(obj) {
var self = this;
this.fr = obj;
+ this.fnx;
this.typeClass = function() {
if(modus == 'kacheln') {
@@ -830,13 +1162,44 @@
}
};
- this.fileName = function() {
+ this.mini = function() {
+ var miniatur = false;
var namen = self.fr.absolutePath.split('/');
if(namen.length > 0) {
- return namen[namen.length - 1];
+ self.fnx = decodeURIComponent(namen[namen.length - 1]);
} else {
- return self.fr.absolutePath;
+ self.fnx = decodeURIComponent(self.fr.absolutePath);
}
+ if(self.fnx.indexOf('.jpg') > -1 || self.fnx.indexOf('.png') > -1 || self.fnx.indexOf('.gif') > -1 || self.fnx.indexOf('.jpeg') > -1) {
+ miniatur = true;
+ }
+ return miniatur;
+ };
+
+ this.miniurl = function() {
+ var userid = $('#userMenu').text();
+ var ext = '';
+ var dotpos = self.fnx.indexOf('.');
+ if(dotpos > -1) {
+ var fny = self.fnx;
+ self.fnx = self.fnx.substring(0, dotpos);
+ ext = fny.substr(dotpos);
+ }
+ var path = fm_get_path(userid);
+ var imgurl = loc + path + '/' + self.fnx + '_tn' + ext;
+ return imgurl;
+
+ };
+
+ this.fileName = function() {
+
+ var namen = self.fr.absolutePath.split('/');
+ if(namen.length > 0) {
+ return decodeURIComponent(namen[namen.length - 1]);
+ } else {
+ return decodeURIComponent(self.fr.absolutePath);
+ }
+
};
}
--
Gitblit v1.9.3