From 94b87168466ef2904087039ac111d569d241b809 Mon Sep 17 00:00:00 2001
From: ulrich <undisclosed>
Date: Fri, 24 Jan 2020 12:35:40 +0000
Subject: [PATCH] in Arbeit: Bereinigung der jQuery-Anteile aus app.js usw.
---
web/ui2/js/app.js | 238 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 130 insertions(+), 108 deletions(-)
diff --git a/web/ui2/js/app.js b/web/ui2/js/app.js
index 650f4de..0cf9e04 100644
--- a/web/ui2/js/app.js
+++ b/web/ui2/js/app.js
@@ -3,97 +3,98 @@
var appMenu;
var vorlagen;
var api;
+ var userid;
- this.datei_neuer_text = function() {
- self.menu_message("Neuer Text");
+ this.datei_neuer_text = function () {
+ self.menu_message("Neuer Text");
};
/* Funktionen aus App-Vorlage */
-
- this.init = function() {
+
+ this.init = function () {
self.vorlagen = new Vorlagen();
self.appMenu = new AppMenu();
self.appMenu.init(
- "data/menu/",
- "hauptmenue.json",
- "data/tpl/app-menu.tpl",
- ".west",
- "8em");
+ "data/menu/",
+ "hauptmenue.json",
+ "data/tpl/app-menu.tpl",
+ ".west",
+ "8em");
- document.querySelector('.hamburger').addEventListener('click', function(e) {
+ document.querySelector('.hamburger').addEventListener('click', function (e) {
self.menue_umschalten();
});
};
- this.menue_umschalten = function() {
+ this.menue_umschalten = function () {
var ham = document.querySelector(".hamburger");
ham.classList.toggle("is-active"); // hamburger-icon umschalten
self.appMenu.toggle(); // menue oeffnen/schliessen
};
- this.info_dialog_zeigen = function() {
+ this.info_dialog_zeigen = function () {
self.dialog_laden_und_zeigen('data/tpl/dlg-info.tpl', '');
self.menue_umschalten();
};
- this.seitenleiste_umschalten = function() {
+ this.seitenleiste_umschalten = function () {
var ostDiv = document.querySelector('.ost');
- if(ostDiv.classList.contains('ost-open')) {
+ if (ostDiv.classList.contains('ost-open')) {
ostDiv.classList.remove('ost-open');
- ostDiv.style.flexBasis = '0em';
+ ostDiv.style.flexBasis = '0em';
} else {
- ostDiv.classList.add('ost-open');
- ostDiv.style.flexBasis = '6em';
+ ostDiv.classList.add('ost-open');
+ ostDiv.style.flexBasis = '6em';
}
self.menue_umschalten();
};
- this.fusszeile_umschalten = function() {
+ this.fusszeile_umschalten = function () {
var suedDiv = document.querySelector('.sued');
- if(suedDiv.classList.contains('sued-open')) {
+ if (suedDiv.classList.contains('sued-open')) {
suedDiv.classList.remove('sued-open');
- suedDiv.style.height = '0';
+ suedDiv.style.height = '0';
} else {
suedDiv.classList.add('sued-open');
- suedDiv.style.height = '1.5em';
+ suedDiv.style.height = '1.5em';
}
self.menue_umschalten();
};
- this.menu_message = function(msg) {
+ this.menu_message = function (msg) {
self.meldung_mit_timeout(msg, 1500);
var suedDiv = document.querySelector('.sued');
- if(suedDiv.classList.contains('sued-open')) {
+ if (suedDiv.classList.contains('sued-open')) {
} else {
suedDiv.classList.add('sued-open');
- suedDiv.style.height = '1.5em';
+ suedDiv.style.height = '1.5em';
}
self.menue_umschalten();
};
- this.message_1 = function() {
+ this.message_1 = function () {
self.menu_message('Eine Mitteilung.');
};
- this.message_2 = function() {
+ this.message_2 = function () {
self.menu_message('Was wir schon immer sagen wollten.');
};
- this.message_3 = function(text) {
+ this.message_3 = function (text) {
self.menu_message(text);
};
- this.meldung_mit_timeout = function(meldung, timeout) {
+ this.meldung_mit_timeout = function (meldung, timeout) {
var s = document.querySelector('.sued');
s.textContent = meldung;
- setTimeout(function() {
+ setTimeout(function () {
s.textContent = 'Bereit.';
- setTimeout(function() {
+ setTimeout(function () {
var suedDiv = document.querySelector('.sued');
- if(suedDiv.classList.contains('sued-open')) {
- suedDiv.classList.remove('sued-open');
- suedDiv.style.height = '0';
+ if (suedDiv.classList.contains('sued-open')) {
+ suedDiv.classList.remove('sued-open');
+ suedDiv.style.height = '0';
}
}, 500);
}, timeout);
@@ -102,40 +103,40 @@
/* Dialog-Funktionen */
/*
- Einen Dialog aus Vorlagen erzeugen
-
- vurl - URL zur Dialogvorlage
- msgTpl - URL mit einer Vorlage eines Mitteilungstextes (optional)
- */
- this.dialog_laden_und_zeigen = function(vurl, msgTpl) {
- if(msgTpl !== '') {
+ Einen Dialog aus Vorlagen erzeugen
+
+ vurl - URL zur Dialogvorlage
+ msgTpl - URL mit einer Vorlage eines Mitteilungstextes (optional)
+ */
+ this.dialog_laden_und_zeigen = function (vurl, msgTpl) {
+ if (msgTpl !== '') {
fetch(msgTpl)
- .then(data => {
- // Handle data
- self.dialog_zeigen(vurl, data);
- }).catch(error => {
- // Handle error
- });
+ .then(data => {
+ // Handle data
+ self.dialog_zeigen(vurl, data);
+ }).catch(error => {
+ // Handle error
+ });
} else {
self.dialog_zeigen(vurl, '');
}
};
- this.dialog_zeigen = function(vurl, inhalt) {
+ this.dialog_zeigen = function (vurl, inhalt) {
var dlg = document.querySelector(".dialog");
self.vorlagen.html_erzeugen(
- vurl,
- inhalt,
- function(html) {
- //dlg.html(html);
- dlg.style.height = '5em';
- dlg.innerHTML = html;
- document.querySelector('.close-btn').addEventListener('click', self.dialog_schliessen);
- //dlg.slideDown(300);
- });
+ vurl,
+ inhalt,
+ function (html) {
+ //dlg.html(html);
+ dlg.style.height = '5em';
+ dlg.innerHTML = html;
+ document.querySelector('.close-btn').addEventListener('click', self.dialog_schliessen);
+ //dlg.slideDown(300);
+ });
};
- self.dialog_schliessen = function() {
+ self.dialog_schliessen = function () {
document.querySelector('.close-btn').removeEventListener('click', self.dialog_schliessen);
//$('.dialog').slideUp(300);
var dlg = document.querySelector('.dialog');
@@ -144,65 +145,86 @@
dlg.innerHTML = '';
};
- /* API functions */
+ /* API functions */
- // http://localhost:8079/file-cms/svc?c=de.uhilger.filecms.api.FileMgr&f=JSONNICE&m=list&p=
- this.fm_get_list = function(relPfad) {
- $('#ansicht').attr('onclick','').unbind('click');
- var m = '?c=de.uhilger.filecms.api.FileMgr&m=list&p=' + relPfad;
- var u = '../svc' + m;
- self.fm_get(u, "json", function(resp) {
+ // http://localhost:8079/file-cms/svc?c=de.uhilger.filecms.api.FileMgr&f=JSONNICE&m=list&p=
+ this.fm_get_list = function (relPfad) {
+ $('#ansicht').attr('onclick', '').unbind('click');
+ var m = '?c=de.uhilger.filecms.api.FileMgr&m=list&p=' + relPfad;
+ var u = '../svc' + m;
+ self.fm_get(u, "json", function (resp) {
- if(resp.List[0].FileRef !== undefined) {
- var files = new Array();
- if(resp.List[0].FileRef instanceof Array) {
- for(var i = 0; i < resp.List[0].FileRef.length; i++) {
- files.push(new FileRef(resp.List[0].FileRef[i]));
- }
- } else {
- files.push(new FileRef(resp.List[0].FileRef));
+ if (resp.List[0].FileRef !== undefined) {
+ var files = new Array();
+ if (resp.List[0].FileRef instanceof Array) {
+ for (var i = 0; i < resp.List[0].FileRef.length; i++) {
+ files.push(new FileRef(resp.List[0].FileRef[i]));
}
- var fl = new FileList(files);
- fm_render_list(fl);
} else {
- $('#dateien').empty();
+ files.push(new FileRef(resp.List[0].FileRef));
}
+ var fl = new FileList(files);
+ fm_render_list(fl);
+ } else {
+ $('#dateien').empty();
+ }
- });
- };
+ });
+ };
-/* -------- ajax helper functions ----------- */
+ /* -------- An- und Abmelden ------------- */
- this.fm_get = function(u, dtype, scallback) {
- $.ajax({
- url: u,
- type: "GET",
- dataType: dtype,
- success: scallback,
- error: function (xhr, status, errorThrown) {
- alert("Error: " + errorThrown + " Status: " + status + " URL: " + u);
- },
- complete: function (xhr, status) {
- //console.log( "The request is complete!" );
- }
+ this.fm_get_login = function() {
+ var m = '?c=de.uhilger.filecms.pub.SessionManager&m=getSessionUser';
+ var u = '../pub' + m;
+ self.fm_get(u, "text", function (resp) {
+ self.userid = resp;
+ document.querySelector("#userMenu").textContent = resp;
+ });
+ };
- });
- };
+ this.fm_logout = function() {
+ var m = '?c=de.uhilger.filecms.pub.SessionManager&m=expireSession';
+ var u = '../pub' + m;
- this.fm_post = function(u, d, dtype, scallback) {
- $.ajax({
- url: u,
- data: d,
- type: "POST",
- dataType: dtype,
- success: scallback,
- error: function (xhr, status, errorThrown) {
- $('#fehler').html("Error: " + errorThrown + " Status: " + status);
- },
- complete: function (xhr, status) {
- //alert( "The request is complete!" );
- }
- });
- };
-
+ self.fm_get(u, "text", function (resp) {
+ //$('#userMenu').text('nicht angemeldet');
+ window.location.href = '../logout.html';
+ });
+ };
+
+ /* -------- ajax helper functions ----------- */
+
+ this.fm_get = function (u, dtype, scallback) {
+ $.ajax({
+ url: u,
+ type: "GET",
+ dataType: dtype,
+ success: scallback,
+ error: function (xhr, status, errorThrown) {
+ alert("Error: " + errorThrown + " Status: " + status + " URL: " + u);
+ },
+ complete: function (xhr, status) {
+ //console.log( "The request is complete!" );
+ }
+
+ });
+ };
+
+ this.fm_post = function (u, d, dtype, scallback) {
+ $.ajax({
+ url: u,
+ data: d,
+ type: "POST",
+ dataType: dtype,
+ success: scallback,
+ error: function (xhr, status, errorThrown) {
+ $('#fehler').html("Error: " + errorThrown + " Status: " + status);
+ },
+ complete: function (xhr, status) {
+ //alert( "The request is complete!" );
+ }
+ });
+ };
+
}
--
Gitblit v1.9.3