From 5ebb8e0cd3961f0c2fb0c9aaf0f4842be523318d Mon Sep 17 00:00:00 2001
From: ulrich <undisclosed>
Date: Wed, 22 Feb 2017 06:17:02 +0000
Subject: [PATCH] Speichern / speichern unter eingebaut, Steuerung Name der offenen Datei
---
web/ui/ui.js | 97 +++++++++++++++++-------------------------------
1 files changed, 34 insertions(+), 63 deletions(-)
diff --git a/web/ui/ui.js b/web/ui/ui.js
index e24ebdb..85524b4 100644
--- a/web/ui/ui.js
+++ b/web/ui/ui.js
@@ -1,14 +1,16 @@
var cm;
var pfad = '';
var modus = 'kacheln';
+var openFileName = '';
function fm_init() {
$('.codeeditor-space').hide();
$('.code-editor-container').hide();
$('#newTextFile').on('click', fm_menu_neue_textdatei);
- $('#newFolder').on('click', fm_menu_neuer_ordner);
+ $('#newFolder').on('click', fm_get_new_folder);
$('#editTextFile').on('click', fm_get_file_content);
$('#saveFile').on('click', fm_menu_datei_speichern);
+ $('#saveFileAs').on('click', fm_menu_datei_speichern_unter);
$('#closeFile').on('click', fm_menu_datei_schliessen);
$('#saveModal').on('hidden.bs.modal', function (e) {
$('#modal_ok').attr('onclick','').unbind('click');
@@ -19,8 +21,6 @@
}
function fm_ansicht_umschalten() {
- //console.log('hat th-list: ' + $('#ansicht').children(0).hasClass('fa-th-list'));
- //console.log('hat th-large: ' + $('#ansicht').children(0).hasClass('fa-th-large'));
if($('#ansicht').children(0).hasClass('fa-th-list')) {
$('#ansicht').children(0).addClass('fa-th-large');
$('#ansicht').children(0).removeClass('fa-th-list');
@@ -44,27 +44,21 @@
}
function fm_menu_neue_textdatei() {
- /*
- $('#dateiansicht').hide();
- $('.codeeditor-space').show();
- $('.code-editor-container').show();
- fm_code_edit('Test');
- */
- fm_text_edit('Test');
+ fm_text_edit('Neue Datei');
}
function fm_menu_datei_schliessen() {
$('.codeeditor-space').hide();
$('.code-editor-container').hide();
cm.toTextArea();
- $('#dateiansicht').show();
+ $('#bcnav').show();
+ $('#dateien').show();
+ openFileName = '';
+ fm_get_list(pfad);
}
function fm_dateiwahl() {
var elem = this;
- //console.log('kachel datei gewaehlt ' + $(elem).text().trim());
- //console.log('liste datei gewaehlt ' + $(elem).children(1).text());
- //console.log('dateiname: ' + $(elem).find('.dateiname').text());
if(modus == 'kacheln') {
if($(elem).children(0).hasClass('fa-folder')) {
var ordner = $(elem).text().trim();
@@ -98,14 +92,9 @@
}
}
-function fm_menu_neuer_ordner() {
- fm_get_new_folder();
-}
-
function fm_bc_click() {
var elem = this;
var bcPfad = $(elem).attr('rpath');
- //console.log(relPath);
if(bcPfad !== undefined) {
pfad = bcPfad;
fm_get_list(bcPfad);
@@ -113,13 +102,11 @@
pfad = '';
fm_get_list('');
}
-
-
- //console.log($(elem).text() + ' ' + $(elem).attr('rpath') + ' ' + $(elem).hasClass('active'));
}
function fm_text_edit(content) {
- $('#dateiansicht').hide();
+ $('#bcnav').hide();
+ $('#dateien').hide();
$('.codeeditor-space').show();
$('.code-editor-container').show();
fm_code_edit(content);
@@ -141,16 +128,8 @@
var m = '?c=de.uhilger.filecms.api.FileMgr&m=newFolder&p=' + pfad + '&p=' + $('#dateiname').val();
var u = '../svc' + m;
fm_get(u, "json", function(resp) {
-
+ fm_get_list(pfad);
});
-
- /*
- var m = '?c=de.uhilger.filecms.api.FileMgr&m=saveTextFile';
- var u = '../svc' + m;
- fm_post(u, {p1: pfad, p2: $('#dateiname').val(), p3: cm.getValue()}, function(resp) {
-
- });
- */
});
$('.modal-title').text('Neuer Ordner');
$('#dialogfrage').text("Name?");
@@ -163,27 +142,17 @@
}
function fm_get_file_content() {
-
var fname = $('.datei-gewaehlt').text();
-
- //console.log(pfad + '/' + fname);
-
+ openFileName = fname;
var m = '?c=de.uhilger.filecms.api.FileMgr&m=getCode&p=' + pfad + '&p=' + fname;
var u = '../svc' + m;
fm_get(u, "text", function(resp) {
- /*
- $('#dateiansicht').hide();
- $('.codeeditor-space').show();
- $('.code-editor-container').show();
- fm_code_edit(resp);
- */
fm_text_edit(resp);
});
}
function fm_render_list(fl) {
- //if($('#ansicht').children(0).hasClass('fa-th-list')) {
if(modus == 'kacheln') {
// Kachelansicht
var template = $('#tpl-kacheln').html();
@@ -279,14 +248,35 @@
}
function fm_menu_datei_speichern() {
+ //var fname = $('.datei-gewaehlt').text();
+ var fname = openFileName;
+ if(fname !== undefined && fname !== '') {
+ fm_save_file(fname);
+ } else {
+ fm_menu_datei_speichern_unter();
+ }
+}
+
+function fm_save_file(saveFileName) {
+ 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) {
+ openFileName = saveFileName;
+ });
+}
+
+function fm_menu_datei_speichern_unter() {
$('#modal_ok').click(function() {
// hier speichern
+ fm_save_file($('#dateiname').val());
+ /*
var m = '?c=de.uhilger.filecms.api.FileMgr&m=saveTextFile';
var u = '../svc' + m;
fm_post(u, {p1: pfad, p2: $('#dateiname').val(), p3: cm.getValue()}, function(resp) {
});
+ */
});
$('.modal-title').text('Datei speichern');
$('#dialogfrage').text("Dateiname?");
@@ -302,21 +292,6 @@
keyboard: false,
show: true
});
-
-
- // FileRef saveTextFile(String relPath, String fileName, String contents)
-
-
- /*
- var t = new Template(-2, $('#filename').val(), self.cm.getValue(), 3);
- var u = '../api/tr/?c=de.uhilger.webbox.api.ContentApi&m=newTemplate';
- self.post(u, {p: self.serialise(t)}, function (resp) {
- self.isnew = false;
- self.editid = resp.Template.id;
- $('#contlist').append(self.buildContListItem(3, resp.Template.name, resp.Template.id));
- $('#templateeditor').addClass('hidden');
- });
- */
}
function fm_logout() {
@@ -333,10 +308,6 @@
/* ---- codemirror editor handling -------- */
function fm_code_edit(content) {
- //var windowHeight = $(window).height();
- //$("editspace").empty();
- //self.cm.toTextArea();
-
cm = CodeMirror.fromTextArea(document.getElementById("editspace"), {
lineNumbers: true,
mode: "xml",
@@ -436,4 +407,4 @@
function BcrFile(rp, n) {
this.relPath = rp;
this.fName = n;
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3