bachir/app.ethica-spinoza.net
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2017-10-15 18:16:21 +02:00
parent c2670d0ec7
commit 36a73919c4
5 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/dist/main.js
Vendored
+14 -13
View File
@@ -3491,16 +3491,16 @@ var _Enonce = {
// // console.log('Enonce on init', vn); // // console.log('Enonce on init', vn);
this.partid = vn.attrs.partid; this.partid = vn.attrs.partid;
this.id = vn.attrs.id; this.id = vn.attrs.id;
this.title = vn.attrs.title; this.title = vn.attrs.title || "";
this.text = vn.attrs.text; this.text = vn.attrs.text;
this.childs = vn.attrs.childs || []; this.childs = vn.attrs.childs || [];
this.nested = vn.attrs.nested || false; this.nested = vn.attrs.nested || false;
}, },
onbeforeupdate:function(vn, old) { onbeforeupdate:function(vn, old) {
// console.log(vn.attrs.childs); // console.log(vn.attrs.childs);
this.title = vn.attrs.title; this.title = vn.attrs.title || "";
this.text = vn.attrs.text; this.text = vn.attrs.text;
this.childs = vn.attrs.childs; this.childs = vn.attrs.childs || [];
this.nested = vn.attrs.nested || false; this.nested = vn.attrs.nested || false;
// if(vn.attrs.id == '1d1') console.log('_Enonce UPDATE, text :', vn.attrs.text); // if(vn.attrs.id == '1d1') console.log('_Enonce UPDATE, text :', vn.attrs.text);
}, },
@@ -3512,7 +3512,7 @@ var _Enonce = {
}, },
[ [
// create title node // create title node
m("h2", {}, this.title), m("h2", {}, m.trust(markdown.renderInline(this.title))),
// create text node // create text node
m(_Text, {'text':this.text, 'id':this.id}), m(_Text, {'text':this.text, 'id':this.id}),
// addd children // addd children
@@ -3637,11 +3637,12 @@ var _Dot = {
// console.log('setuptext', vn); // console.log('setuptext', vn);
// construct text // construct text
this.text = markdown.render(vn.attrs.text); this.text = vn.attrs.text || '';
this.rendered_text = markdown.render(this.text);
// construct summary // construct summary
// TODO: summary needs more work (strip tags, markdown render) // TODO: summary needs more work (strip tags, markdown render)
this.summary = vn.attrs.text.match('([^ ]*[ ]{0,1}){1,6}')[0]; this.summary = this.text.match('([^ ]*[ ]{0,1}){1,6}')[0];
this.summary = this.summary.trim().replace(/_([^_]+)$/g, "_$1_"); this.summary = this.summary.trim().replace(/_([^_]+)$/g, "_$1_");
this.summary = this.summary.replace(/\[([^\]]+)$/g, "$1"); this.summary = this.summary.replace(/\[([^\]]+)$/g, "$1");
this.summary = markdown.renderInline(this.summary) + " …"; this.summary = markdown.renderInline(this.summary) + " …";
@@ -3736,7 +3737,7 @@ var _Dot = {
vn.dom.querySelector('nav.links>div[uid="'+id+'"]>.summary').click(); vn.dom.querySelector('nav.links>div[uid="'+id+'"]>.summary').click();
} }
} }
}, m.trust(this.text)), }, m.trust(this.rendered_text)),
// links from // links from
this.links.from.length this.links.from.length
? m('nav', {'class':'links from'}, this.links.from.map(function(id){ ? m('nav', {'class':'links from'}, this.links.from.map(function(id){
@@ -3854,16 +3855,16 @@ var _Enonce = {
// // console.log('Enonce on init', vn); // // console.log('Enonce on init', vn);
this.partid = vn.attrs.partid; this.partid = vn.attrs.partid;
this.id = vn.attrs.id; this.id = vn.attrs.id;
this.title = vn.attrs.title; this.title = vn.attrs.title || "";
this.text = vn.attrs.text; this.text = vn.attrs.text;
this.childs = vn.attrs.childs; this.childs = vn.attrs.childs || [];
// this.nested = vn.attrs.nested || false; // this.nested = vn.attrs.nested || false;
}, },
onbeforeupdate:function(vn, old) { onbeforeupdate:function(vn, old) {
// console.log(vn.attrs.childs); // console.log(vn.attrs.childs);
this.title = vn.attrs.title; this.title = vn.attrs.title || "";
this.text = vn.attrs.text; this.text = vn.attrs.text;
this.childs = vn.attrs.childs; this.childs = vn.attrs.childs || [];
// this.nested = vn.attrs.nested || false; // this.nested = vn.attrs.nested || false;
// if(vn.attrs.id == '1d1') console.log('_Enonce UPDATE, text :', vn.attrs.text); // if(vn.attrs.id == '1d1') console.log('_Enonce UPDATE, text :', vn.attrs.text);
}, },
@@ -3889,12 +3890,12 @@ var _Enonce = {
var _Part = { var _Part = {
oninit: function(vn){ oninit: function(vn){
this.id = vn.attrs.id; this.id = vn.attrs.id;
this.title = vn.attrs.title; this.title = vn.attrs.title || "";
this.enonces = vn.attrs.enonces; this.enonces = vn.attrs.enonces;
}, },
onbeforeupdate: function(vn, old){ onbeforeupdate: function(vn, old){
// console.log('_Part, onbeforeupdate old',old); // console.log('_Part, onbeforeupdate old',old);
this.title = vn.attrs.title; this.title = vn.attrs.title || "";
this.enonces = vn.attrs.enonces; this.enonces = vn.attrs.enonces;
}, },
view: function(vn){ view: function(vn){
assets/dist/main.js.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
assets/modules/inline.js
+4 -4
View File
@@ -211,16 +211,16 @@ var _Enonce = {
// // console.log('Enonce on init', vn); // // console.log('Enonce on init', vn);
this.partid = vn.attrs.partid; this.partid = vn.attrs.partid;
this.id = vn.attrs.id; this.id = vn.attrs.id;
this.title = vn.attrs.title; this.title = vn.attrs.title || "";
this.text = vn.attrs.text; this.text = vn.attrs.text;
this.childs = vn.attrs.childs || []; this.childs = vn.attrs.childs || [];
this.nested = vn.attrs.nested || false; this.nested = vn.attrs.nested || false;
}, },
onbeforeupdate:function(vn, old) { onbeforeupdate:function(vn, old) {
// console.log(vn.attrs.childs); // console.log(vn.attrs.childs);
this.title = vn.attrs.title; this.title = vn.attrs.title || "";
this.text = vn.attrs.text; this.text = vn.attrs.text;
this.childs = vn.attrs.childs; this.childs = vn.attrs.childs || [];
this.nested = vn.attrs.nested || false; this.nested = vn.attrs.nested || false;
// if(vn.attrs.id == '1d1') console.log('_Enonce UPDATE, text :', vn.attrs.text); // if(vn.attrs.id == '1d1') console.log('_Enonce UPDATE, text :', vn.attrs.text);
}, },
@@ -232,7 +232,7 @@ var _Enonce = {
}, },
[ [
// create title node // create title node
m("h2", {}, this.title), m("h2", {}, m.trust(markdown.renderInline(this.title))),
// create text node // create text node
m(_Text, {'text':this.text, 'id':this.id}), m(_Text, {'text':this.text, 'id':this.id}),
// addd children // addd children
assets/modules/tree.js
+10 -9
View File
@@ -29,11 +29,12 @@ var _Dot = {
// console.log('setuptext', vn); // console.log('setuptext', vn);
// construct text // construct text
this.text = markdown.render(vn.attrs.text); this.text = vn.attrs.text || '';
this.rendered_text = markdown.render(this.text);
// construct summary // construct summary
// TODO: summary needs more work (strip tags, markdown render) // TODO: summary needs more work (strip tags, markdown render)
this.summary = vn.attrs.text.match('([^ ]*[ ]{0,1}){1,6}')[0]; this.summary = this.text.match('([^ ]*[ ]{0,1}){1,6}')[0];
this.summary = this.summary.trim().replace(/_([^_]+)$/g, "_$1_"); this.summary = this.summary.trim().replace(/_([^_]+)$/g, "_$1_");
this.summary = this.summary.replace(/\[([^\]]+)$/g, "$1"); this.summary = this.summary.replace(/\[([^\]]+)$/g, "$1");
this.summary = markdown.renderInline(this.summary) + " …"; this.summary = markdown.renderInline(this.summary) + " …";
@@ -128,7 +129,7 @@ var _Dot = {
vn.dom.querySelector('nav.links>div[uid="'+id+'"]>.summary').click(); vn.dom.querySelector('nav.links>div[uid="'+id+'"]>.summary').click();
} }
} }
}, m.trust(this.text)), }, m.trust(this.rendered_text)),
// links from // links from
this.links.from.length this.links.from.length
? m('nav', {'class':'links from'}, this.links.from.map(function(id){ ? m('nav', {'class':'links from'}, this.links.from.map(function(id){
@@ -246,16 +247,16 @@ var _Enonce = {
// // console.log('Enonce on init', vn); // // console.log('Enonce on init', vn);
this.partid = vn.attrs.partid; this.partid = vn.attrs.partid;
this.id = vn.attrs.id; this.id = vn.attrs.id;
this.title = vn.attrs.title; this.title = vn.attrs.title || "";
this.text = vn.attrs.text; this.text = vn.attrs.text;
this.childs = vn.attrs.childs; this.childs = vn.attrs.childs || [];
// this.nested = vn.attrs.nested || false; // this.nested = vn.attrs.nested || false;
}, },
onbeforeupdate:function(vn, old) { onbeforeupdate:function(vn, old) {
// console.log(vn.attrs.childs); // console.log(vn.attrs.childs);
this.title = vn.attrs.title; this.title = vn.attrs.title || "";
this.text = vn.attrs.text; this.text = vn.attrs.text;
this.childs = vn.attrs.childs; this.childs = vn.attrs.childs || [];
// this.nested = vn.attrs.nested || false; // this.nested = vn.attrs.nested || false;
// if(vn.attrs.id == '1d1') console.log('_Enonce UPDATE, text :', vn.attrs.text); // if(vn.attrs.id == '1d1') console.log('_Enonce UPDATE, text :', vn.attrs.text);
}, },
@@ -281,12 +282,12 @@ var _Enonce = {
var _Part = { var _Part = {
oninit: function(vn){ oninit: function(vn){
this.id = vn.attrs.id; this.id = vn.attrs.id;
this.title = vn.attrs.title; this.title = vn.attrs.title || "";
this.enonces = vn.attrs.enonces; this.enonces = vn.attrs.enonces;
}, },
onbeforeupdate: function(vn, old){ onbeforeupdate: function(vn, old){
// console.log('_Part, onbeforeupdate old',old); // console.log('_Part, onbeforeupdate old',old);
this.title = vn.attrs.title; this.title = vn.attrs.title || "";
this.enonces = vn.attrs.enonces; this.enonces = vn.attrs.enonces;
}, },
view: function(vn){ view: function(vn){
upload.sh
+4
View File
@@ -4,6 +4,10 @@ rsync -rvc --delete-before \
index.html \ index.html \
CT-figli-deb9-lamp:www/ethica-spinoza.net/public_html/ CT-figli-deb9-lamp:www/ethica-spinoza.net/public_html/
rsync -rvc --delete-before \
.htaccess \
CT-figli-deb9-lamp:www/ethica-spinoza.net/public_html/
rsync -rvc --delete-before \ rsync -rvc --delete-before \
assets/dist \ assets/dist \
CT-figli-deb9-lamp:www/ethica-spinoza.net/public_html/assets/ CT-figli-deb9-lamp:www/ethica-spinoza.net/public_html/assets/