From 7d8ef67736311d75b97a249482a938662035fd39 Mon Sep 17 00:00:00 2001
From: Ulrich <undisclosed>
Date: Mon, 27 Feb 2017 11:04:06 +0000
Subject: [PATCH] Mustache wieder als Teil der HTML-Datei. TinyMCE in erster Fassung fertig eingebaut.
---
web/ui/ui.js | 240 +++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 172 insertions(+), 68 deletions(-)
diff --git a/web/ui/ui.js b/web/ui/ui.js
index 9f66ee4..47ca193 100644
--- a/web/ui/ui.js
+++ b/web/ui/ui.js
@@ -20,14 +20,23 @@
var pfad = '';
var modus = 'kacheln';
var openFileName = '';
+var ed;
+var openEditor;
function fm_init() {
+ $("#mce-editor").hide();
$('.codeeditor-space').hide();
$('.code-editor-container').hide();
//$('.ost').attr('flex-basis', 0);
$('#newTextFile').on('click', fm_menu_neue_textdatei);
+ $('#newDoc').on('click', fm_menu_neues_dokument);
$('#newFolder').on('click', fm_get_new_folder);
- $('#editTextFile').on('click', fm_get_file_content);
+ $('#editTextFile').on('click', function() {
+ fm_get_file_content('text');
+ });
+ $('#editDocFile').on('click', function() {
+ fm_get_file_content('dok');
+ });
$('#saveFile').on('click', fm_menu_datei_speichern);
$('#saveFileAs').on('click', fm_menu_datei_speichern_unter);
$('#closeFile').on('click', fm_menu_datei_schliessen);
@@ -40,6 +49,44 @@
fm_get_login();
fm_get_list('');
fm_init_uploader();
+
+ /*
+ * Konfiguration TinyMCE
+ */
+ tinymce.init({
+ content_css : "mce.css",
+ selector: "textarea.text-editor",
+ statusbar: false,
+ menubar: false,
+ plugins: 'advlist charmap code image link lists media print preview save table textcolor',
+ toolbar: 'undo redo | styleselect | image | link unlink | bullist numlist | outdent indent | code',
+ /*
+ menu: {
+ file: {title: 'File', items: 'savevers | exit'},
+ edit: {title: 'Edit', items: 'undo redo | cut copy paste pastetext | selectall'},
+ view: {title: 'View', items: 'visualaid | code | link image media | template hr'},
+ },
+ */
+ /*resize: 'both',*/
+ width: "100%",
+ height: '100%',
+ /*autoresize_bottom_margin : 1,*/
+ setup: function (editor) {
+ ed = editor;
+ }
+ });
+ window.onresize = function() {
+ fm_resizeEditor();
+ };
+}
+function fm_resizeEditor() {
+ if (ed) {
+ try {
+ var myHeight = $('.zentrum').height() - $('.nord').height() - 4;
+ ed.theme.resizeTo('100%', myHeight); // sets the dimensions of the editable area
+ } catch (err) {
+ }
+ }
}
/* ----- Uploader Anfang ----------*/
@@ -142,14 +189,27 @@
fm_text_edit('Neue Datei');
}
+function fm_menu_neues_dokument() {
+ /*
+ fm_filectls_hide();
+ $("#mce-editor").show();
+ fm_resizeEditor();
+ openEditor = 'dok';
+ */
+ fm_dok_edit('');
+}
+
function fm_menu_datei_schliessen() {
$('.codeeditor-space').hide();
$('.code-editor-container').hide();
- cm.toTextArea();
- $('#bcnav').show();
- $('#dateien').show();
+ $("#mce-editor").hide();
+ if(cm !== undefined) {
+ cm.toTextArea();
+ }
openFileName = '';
+ openEditor = '';
fm_get_list(pfad);
+ fm_filectls_show();
}
function fm_dateiwahl(ev) {
@@ -221,13 +281,30 @@
}
function fm_text_edit(content) {
- $('#bcnav').hide();
- $('#dateien').hide();
+ fm_filectls_hide();
$('.codeeditor-space').show();
$('.code-editor-container').show();
fm_code_edit(content);
+ openEditor = 'text';
}
+function fm_dok_edit(content) {
+ fm_filectls_hide();
+ $("#mce-editor").show();
+ ed.setContent(content);
+ fm_resizeEditor();
+ openEditor = 'dok';
+}
+
+function fm_filectls_hide() {
+ $('#zentrum_bc').hide();
+ $('#dateien').hide();
+}
+
+function fm_filectls_show() {
+ $('#zentrum_bc').show();
+ $('#dateien').show();
+}
/* ----- API Calls ------------- */
function fm_get_login() {
@@ -257,7 +334,7 @@
});
}
-function fm_get_file_content() {
+function fm_get_file_content(typ) {
var gewaehlte = $('.datei-gewaehlt');
//var fname = $(gewaehlte).find('.dateiname').text();
@@ -266,7 +343,11 @@
var m = '?c=de.uhilger.filecms.api.FileMgr&m=getCode&p=' + pfad + '&p=' + fname;
var u = '../svc' + m;
fm_get(u, "text", function(resp) {
- fm_text_edit(resp);
+ if(typ == 'text') {
+ fm_text_edit(resp);
+ } else {
+ fm_dok_edit(resp);
+ }
});
}
@@ -301,6 +382,24 @@
function fm_render_list(fl) {
if(modus == 'kacheln') {
// Kachelansicht
+ var template = $('#tpl-kacheln').html();
+ Mustache.parse(template); // optional, speeds up future uses
+ $('.datei-zeile').attr('onclick','').unbind('click');
+ $('#dateien').empty();
+ $('#dateien').html(Mustache.render(template, fl));
+ $('.figure').click(fm_dateiwahl);
+ } else {
+ // Listenansicht
+ var template = $('#tpl-liste').html();
+ Mustache.parse(template); // optional, speeds up future uses
+ $('.figure').attr('onclick','').unbind('click');
+ $('#dateien').empty();
+ $('#dateien').html(Mustache.render(template, fl));
+ $('.datei-zeile').click(fm_dateiwahl);
+ }
+ /*
+ if(modus == 'kacheln') {
+ // Kachelansicht
$.get('tpl-kacheln.txt', function(template) {
$('#dateien').empty();
$('#dateien').html(Mustache.render(template, fl));
@@ -316,6 +415,7 @@
});
$('.figure').attr('onclick','').unbind('click');
}
+ */
}
// http://localhost:8079/file-cms/svc?c=de.uhilger.filecms.api.FileMgr&f=JSONNICE&m=list&p=
@@ -341,7 +441,7 @@
}
// Breadcrumb-Ansicht
- //var template;
+ var template;
$('.breadcrumb-item').attr('onclick','').unbind('click');
$('#bcnav').empty();
var dirList = new Array();
@@ -361,68 +461,66 @@
}
}
var bl = new BcrFiles(dirList);
-
- if(dirList.length > 0) {
- $.get('tpl-bcr.txt', function(template) {
- $('#bcnav').html(Mustache.render(template, bl));
- if(dirs.length > 0) {
- dirList.push(new BcrFile(rp + '/' + dirs[dirs.length-1], dirs[dirs.length-1]));
- $.get('tpl-bcr2.txt', function(template) {
- $('#bcnav').append(Mustache.render(template, dirList[dirList.length-1]));
- $('#bcnav').append($('#tpl-bcr3').html());
- fm_bcr_end();
- });
- //template = $('#tpl-bcr2').html();
- //Mustache.parse(template); // optional, speeds up future uses
- //$('#bcnav').append(Mustache.render(template, dirList[dirList.length-1]));
- } else {
- $.get('tpl-bcr2.txt', function(template) {
- $('#bcnav').append(Mustache.render(template, dirList[0]));
- $('#bcnav').append($('#tpl-bcr3').html());
- fm_bcr_end();
- });
- //template = $('#tpl-bcr2').html();
- //Mustache.parse(template); // optional, speeds up future uses
- //$('#bcnav').append(Mustache.render(template, dirList[0]));
- }
- });
- } else {
- if(dirs.length > 0) {
- dirList.push(new BcrFile(rp + '/' + dirs[dirs.length-1], dirs[dirs.length-1]));
- $.get('tpl-bcr2.txt', function(template) {
- $('#bcnav').append(Mustache.render(template, dirList[dirList.length-1]));
- $('#bcnav').append($('#tpl-bcr3').html());
- fm_bcr_end();
- });
- //template = $('#tpl-bcr2').html();
- //Mustache.parse(template); // optional, speeds up future uses
- //$('#bcnav').append(Mustache.render(template, dirList[dirList.length-1]));
- } else {
- $.get('tpl-bcr2.txt', function(template) {
- $('#bcnav').append(Mustache.render(template, dirList[0]));
- $('#bcnav').append($('#tpl-bcr3').html());
- fm_bcr_end();
- });
- //template = $('#tpl-bcr2').html();
- //Mustache.parse(template); // optional, speeds up future uses
- //$('#bcnav').append(Mustache.render(template, dirList[0]));
- }
+
+ if(dirList.length > 0) {
+ template = $('#tpl-bcr').html();
+ Mustache.parse(template); // optional, speeds up future uses
+ $('#bcnav').html(Mustache.render(template, bl));
}
+
+ if(dirs.length > 0) {
+ dirList.push(new BcrFile(rp + '/' + dirs[dirs.length-1], dirs[dirs.length-1]));
+ template = $('#tpl-bcr2').html();
+ Mustache.parse(template); // optional, speeds up future uses
+ $('#bcnav').append(Mustache.render(template, dirList[dirList.length-1]));
+ } else {
+ template = $('#tpl-bcr2').html();
+ Mustache.parse(template); // optional, speeds up future uses
+ $('#bcnav').append(Mustache.render(template, dirList[0]));
+ }
+
+ $('#bcnav').append($('#tpl-bcr3').html());
} else {
pfad = '';
- $.get('tpl-bcr2.txt', function(template) {
- $('#bcnav').append(Mustache.render(template, dirList[0]));
- $('#bcnav').append($('#tpl-bcr3').html());
- fm_bcr_end();
- });
- //template = $('#tpl-bcr2').html();
- //Mustache.parse(template); // optional, speeds up future uses
- //$('#bcnav').append(Mustache.render(template, dirList[0]));
- //$('#bcnav').append($('#tpl-bcr3').html());
+ template = $('#tpl-bcr2').html();
+ Mustache.parse(template); // optional, speeds up future uses
+ $('#bcnav').append(Mustache.render(template, dirList[0]));
+ $('#bcnav').append($('#tpl-bcr3').html());
}
- //$('.breadcrumb-item').click(fm_bc_click);
- //$('#ansicht').click(fm_ansicht_umschalten);
- //fm_set_modus();
+ $('.breadcrumb-item').click(fm_bc_click);
+ $('#ansicht').click(fm_ansicht_umschalten);
+ fm_set_modus();
+ });
+}
+
+/*
+function fm_bcr_step2(dirs, dirList) {
+ if(dirs.length > 0) {
+ dirList.push(new BcrFile(rp + '/' + dirs[dirs.length-1], dirs[dirs.length-1]));
+ $.get('tpl-bcr2.txt', function(template) {
+ $('#bcnav').append(Mustache.render(template, dirList[dirList.length-1]));
+ $('#bcnav').append($('#tpl-bcr3').html());
+ fm_bcr_end();
+ });
+ //template = $('#tpl-bcr2').html();
+ //Mustache.parse(template); // optional, speeds up future uses
+ //$('#bcnav').append(Mustache.render(template, dirList[dirList.length-1]));
+ } else {
+ $.get('tpl-bcr2.txt', function(template) {
+ $('#bcnav').append(Mustache.render(template, dirList[0]));
+ $('#bcnav').append($('#tpl-bcr3').html());
+ fm_bcr_end();
+ });
+ //template = $('#tpl-bcr2').html();
+ //Mustache.parse(template); // optional, speeds up future uses
+ //$('#bcnav').append(Mustache.render(template, dirList[0]));
+ }
+}
+*/
+
+function fm_bcr_3() {
+ $.get('tpl-bcr3.txt', function(template) {
+ $('#bcnav').append(template);
});
}
@@ -443,9 +541,15 @@
}
function fm_save_file(saveFileName) {
+ var content;
+ if(openEditor === 'text') {
+ content = cm.getValue();
+ } else {
+ content = ed.getContent();
+ }
var m = '?c=de.uhilger.filecms.api.FileMgr&m=saveTextFile';
var u = '../svc' + m;
- fm_post(u, {p1: pfad, p2: saveFileName, p3: cm.getValue()}, function(resp) {
+ fm_post(u, {p1: pfad, p2: saveFileName, p3: content}, function(resp) {
openFileName = saveFileName;
});
}
--
Gitblit v1.9.3