From 7c161236f36d77bd9765822bc3d21119f84727f3 Mon Sep 17 00:00:00 2001 From: DanyLE Date: Wed, 4 Jan 2023 00:33:08 +0100 Subject: [PATCH] Update Blogger and Booklet to use new MDE library --- Blogger/README.md | 1 + Blogger/build/debug/README.md | 1 + Blogger/build/debug/main.js | 2 +- Blogger/build/debug/package.json | 4 ++-- Blogger/build/release/Blogger.zip | Bin 9210 -> 9247 bytes Blogger/dialogs.coffee | 8 ++++---- Blogger/main.coffee | 14 +++++++------- Blogger/package.json | 4 ++-- Booklet/README.md | 2 ++ Booklet/build/debug/README.md | 2 ++ Booklet/build/debug/main.js | 2 +- Booklet/build/debug/package.json | 4 ++-- Booklet/build/release/Booklet.zip | Bin 5200 -> 5226 bytes Booklet/coffees/main.coffee | 14 +++++++------- Booklet/package.json | 4 ++-- packages.json | 8 ++++---- 16 files changed, 38 insertions(+), 32 deletions(-) diff --git a/Blogger/README.md b/Blogger/README.md index 79b221f..8b57be7 100644 --- a/Blogger/README.md +++ b/Blogger/README.md @@ -6,6 +6,7 @@ Blackend for my blog at https://blog.iohub.dev ## Change logs ### v0.2.x-a +* Patch 9: Update to use the new MDE library * Patch 8: Support for antOS 2.0.x * Patch 7: Fix sendmail API security bug * Patch 6: Chage libraries load order diff --git a/Blogger/build/debug/README.md b/Blogger/build/debug/README.md index 79b221f..8b57be7 100644 --- a/Blogger/build/debug/README.md +++ b/Blogger/build/debug/README.md @@ -6,6 +6,7 @@ Blackend for my blog at https://blog.iohub.dev ## Change logs ### v0.2.x-a +* Patch 9: Update to use the new MDE library * Patch 8: Support for antOS 2.0.x * Patch 7: Fix sendmail API security bug * Patch 6: Chage libraries load order diff --git a/Blogger/build/debug/main.js b/Blogger/build/debug/main.js index 18f370e..985e4f6 100644 --- a/Blogger/build/debug/main.js +++ b/Blogger/build/debug/main.js @@ -1 +1 @@ -(function(){var t,e,i,s,a,n;(e=class extends this.OS.application.BaseApplication{constructor(t){super("Blogger",t)}main(){var t;return this.user={},this.cvlist=this.find("cv-list"),this.cvlist.ontreeselect=t=>{var e;if(t)return e=t.data.item.data,this.CVSectionByCID(Number(e.id))},this.inputtags=this.find("input-tags"),this.bloglist=this.find("blog-list"),this.seclist=this.find("cv-sec-list"),t=this.find("photo"),$(t).click(e=>this.openDialog("FileDialog",{title:__("Select image file"),mimes:["image/.*"]}).then(e=>t.value=e.file.path).catch(t=>this.error(__("Unable to get file"),t))),this.userdb=new this._api.DB("user"),this.cvcatdb=new this._api.DB("cv_cat"),this.cvsecdb=new this._api.DB("cv_sections"),this.blogdb=new this._api.DB("blogs"),this.tabcontainer=this.find("tabcontainer"),this.tabcontainer.ontabselect=t=>this.fetchData(t.data.container.aid),this.find("bt-user-save").onbtclick=t=>this.saveUser(),this.find("cv-cat-add").onbtclick=t=>{var e;return e=t=>this.openDialog(new s,{title:__("Add category"),tree:t}).then(t=>{var e;return e={name:t.value,pid:t.p.id,publish:1},this.cvcatdb.save(e).then(t=>this.refreshCVCat()).catch(t=>this.error(__("Cannot add new category"),t))}).catch(t=>this.error(t.toString(),t)),this.fetchCVCat().then(t=>e(t)).catch(t=>(e({text:"Porfolio",id:"0",nodes:[]}),this.error(__("Unable to fetch categories"),t)))},this.find("cv-cat-edit").onbtclick=t=>{var e,i;if((i=this.cvlist.selectedItem)&&(e=i.data))return this.fetchCVCat().then(t=>this.openDialog(new s,{title:__("Edit category"),tree:t,cat:e}).then(t=>{var i;return i={id:e.id,publish:e.publish,pid:t.p.id,name:t.value},this.cvcatdb.save(i).then(t=>this.refreshCVCat()).catch(t=>this.error(__("Cannot Edit category"),t))})).catch(t=>this.error(__("Unable to fetch categories"),t))},this.find("cv-cat-del").onbtclick=t=>{var e,i;if((i=this.cvlist.selectedItem)&&(e=i.data))return this.openDialog("YesNoDialog",{title:__("Delete category"),iconclass:"fa fa-question-circle",text:__("Do you really want to delete: {0}?",e.name)}).then(t=>{if(t)return this.deleteCVCat(e)}).catch(t=>this.error(t.toString(),t))},this.find("cv-sec-add").onbtclick=t=>{var e,s;if(s=this.cvlist.selectedItem)return(e=s.data)&&"0"!==e.id?this.openDialog(new i(this),{title:__("New section entry for {0}",e.name)}).then(t=>(t.cid=Number(e.id),t.start=Number(t.start),t.end=Number(t.end),this.cvsecdb.save(t).then(t=>this.CVSectionByCID(Number(e.id))).catch(t=>this.error(__("Cannot save section: {0}",t.toString()),t)))):this.notify(__("Please select a category"))},this.find("cv-sec-move").onbtclick=t=>{var e,i;return(i=this.find("cv-sec-list").selectedItem)?(e=i.data,this.fetchCVCat().then(t=>this.openDialog(new s,{title:__("Move to"),tree:t,selonly:!0}).then(t=>{var i;return i={id:e.id,cid:t.p.id},this.cvsecdb.save(i).then(t=>(this.CVSectionByCID(e.cid),this.find("cv-sec-list").unselect())).catch(t=>this.error(__("Cannot move section"),t))}))):this.notify(__("Please select a section to move"))},this.find("cv-sec-edit").onbtclick=t=>{var e,s;return(s=this.find("cv-sec-list").selectedItem)?(e=s.data,this.openDialog(new i(this),{title:__("Modify section entry"),section:e}).then(t=>(t.cid=Number(e.cid),t.start=Number(t.start),t.end=Number(t.end),this.cvsecdb.save(t).then(t=>this.CVSectionByCID(Number(e.cid))).catch(t=>this.error(__("Cannot save section: {0}",t.toString()),t))))):this.notify(__("Please select a section to edit"))},this.seclist.onitemclose=t=>{var e;if(t)return e=t.data.item.data,this.openDialog("YesNoDialog",{iconclass:"fa fa-question-circle",text:__("Do you really want to delete: {0}?",e.title)}).then(i=>{if(i)return this.cvsecdb.delete(e.id).then(e=>this.seclist.delete(t.data.item)).catch(t=>this.error(__("Cannot delete the section: {0}",t.toString()),t))}),!1},this.editor=new SimpleMDE({element:this.find("markarea"),autoDownloadFontAwesome:!1,autofocus:!0,tabSize:4,indentWithTabs:!0,toolbar:[{name:__("New"),className:"fa fa-file",action:t=>(this.bloglist.unselect(),this.clearEditor())},{name:__("Save"),className:"fa fa-save",action:t=>this.saveBlog()},"|","bold","italic","heading","|","quote","code","unordered-list","ordered-list","|","link","image","table","horizontal-rule",{name:"image",className:"fa fa-file-image-o",action:t=>this.openDialog("FileDialog",{title:__("Select image file"),mimes:["image/.*"]}).then(t=>t.file.path.asFileHandle().publish().then(t=>this.editor.codemirror.getDoc().replaceSelection(`![](${this._api.handle.shared}/${t.result})`)).catch(t=>this.error(__("Cannot export file for embedding to text"),t)))},{name:"Youtube",className:"fa fa-youtube",action:t=>this.editor.codemirror.getDoc().replaceSelection("[[youtube:]]")},"|",{name:__("Preview"),className:"fa fa-eye no-disable",action:t=>(this.previewOn=!this.previewOn,SimpleMDE.togglePreview(t),renderMathInElement(this.find("editor-container")))},"|",{name:__("Send mail"),className:"fa fa-paper-plane",action:t=>{var e,i;return(i=this.bloglist.selectedItem)?(e=i.data,this.openDialog(new a(this),{title:__("Send mail"),content:this.editor.value(),id:e.id}).then((function(t){return console.log("Email sent")}))):this.error(__("No post selected"))}}]}),this.bloglist.onlistselect=e=>{var i;if((t=this.bloglist.selectedItem)&&(i=t.data))return this.blogdb.get(Number(i.id)).then(t=>(this.editor.value(t.content),this.inputtags.value=t.tags,this.find("blog-publish").swon=!!Number(t.publish))).catch(t=>this.error(__("Cannot fetch the entry content"),t))},this.bloglist.onitemclose=e=>{var i;if(e)return t=e.data.item,i=t.data,this.openDialog("YesNoDialog",{title:__("Delete a post"),iconclass:"fa fa-question-circle",text:__("Do you really want to delete this post ?")}).then(e=>{if(e)return this.blogdb.delete(i.id).then(e=>(this.bloglist.delete(t),this.bloglist.unselect(),this.clearEditor()))}),!1},this.bindKey("CTRL-S",()=>{var t;if((t=this.tabcontainer.selectedTab)&&"blog-container"===t.container.aid)return this.saveBlog()}),this.on("vboxchange",()=>this.resizeContent()),this.resizeContent(),this.loadBlogs()}fetchData(t){switch(t){case"user-container":return this.userdb.get(null).then(t=>{var e,i,s,a,n;for(this.user=t[0],a=[],e=0,s=(i=this.select("[input-class='user-input']")).length;ethis.error(__("Cannot fetch user data"),t));case"cv-container":return this.refreshCVCat();default:return this.loadBlogs()}}saveUser(){var t,e,i,s;for(t=0,i=(e=this.select("[input-class='user-input']")).length;tthis.notify(__("User data updated"))).catch(t=>this.error(__("Cannot save user data"),t)):this.notify(__("Full name must be entered"))}refreshCVCat(){return this.fetchCVCat().then(t=>(this.cvlist.data=t,this.cvlist.expandAll())).catch(t=>this.error(__("Unable to load categories"),t))}fetchCVCat(){return new Promise((t,e)=>{var i,s;return s={text:"Porfolio",id:"0",nodes:[]},i={order:{name:"ASC"}},this.cvcatdb.find(i).then(e=>(this.catListToTree(e,s,"0"),t(s))).catch((function(t){return e(__e(t))}))})}catListToTree(t,e,i){var s,a,n,r,o;if(0===(n=function(){var e,s,a;for(a=[],e=0,s=t.length;e(e=function(){var t,e,i;for(i=[],t=0,e=s.length;t(this.refreshCVCat(),this.seclist.data=[])).catch(e=>this.error(__("Cannot delete the category: {0} [{1}]",t.name,e.toString()),e)))).catch(e=>this.error(__("Cannot delete all content of: {0} [{1}]",t.name,e.toString()),e))}CVSectionByCID(t){var e;return e={exp:{"=":{cid:t}},order:{start:"DESC"}},this.cvsecdb.find(e).then(t=>{var e,i,s,a;for(i=[],this.find("cv-sec-status").text=__("Found {0} sections",t.length),e=0,s=t.length;ethis.error(t.toString(),t))}saveBlog(){var t,e,i,s,a,n,r;return s=void 0,(a=this.bloglist.selectedItem)&&(s=a.data),n=this.inputtags.value,t=this.editor.value(),(r=new RegExp("^#+(.*)\n","g").exec(t))&&2===r.length?""===n?this.notify(__("Please enter tags")):(e=new Date,i={content:t,title:r[1].trim(),tags:n,ctime:s?s.ctime:e.timestamp(),ctimestr:s?s.ctimestr:e.toString(),utime:e.timestamp(),utimestr:e.toString(),rendered:this.process(this.editor.options.previewRender(t)),publish:this.find("blog-publish").swon?1:0},s&&(i.id=s.id),this.blogdb.save(i).then(t=>this.loadBlogs()).catch(t=>this.error(__("Cannot save blog: {0}",t.toString()),t))):this.notify(__("Please insert a title in the text: beginning with heading"))}process(t){var e,i,s,a,n,r,o,l,h;for(i=function(t){return``},o=/\[\[youtube:([^\]]*)\]\]/g,l=[];null!==(s=o.exec(t));)l.push(s);if(!(l.length>0))return t;for(h="",e=0,a=0,r=l.length;a{var e,s;for(e=0,s=t.length;ethis.error(__("No post found: {0}",t.toString()),t))}resizeContent(){var t,e,i,s,a,n;return i=this.find("editor-container"),e=$(i).children(),a=$(this.scheme).find(".afx-window-top")[0],n=e[1],s=e[4],t=$(this.scheme).height()-$(a).height()-$(n).height()-$(s).height()-90,$(e[2]).css("height",t+"px")}}).singleton=!0,e.dependencies=["pkg://SimpleMDE/main.js","pkg://SimpleMDE/main.css","pkg://Katex/main.js","pkg://Katex/main.css"],this.OS.register("Blogger",e),(s=class t extends this.OS.GUI.BasicDialog{constructor(){super("BloggerCategoryDialog",t.scheme)}main(){var t;if(super.main(),this.tree=this.find("tree"),this.txtinput=this.find("txtinput"),this.find("bt-ok").onbtclick=t=>{var e,i,s;return(e=this.tree.selectedItem)?(i=e.data,""!==(s=this.txtinput.value)||this.data.selonly?this.data.cat&&this.data.cat.id===i.id?this.notify(__("Parent can not be the category itself")):(this.handle&&this.handle({p:i,value:s}),this.quit()):this.notify(__("Please enter category name"))):this.notify(__("Please select a parent category"))},this.find("bt-cancel").onbtclick=t=>this.quit(),this.data&&this.data.tree)return this.data&&this.data.cat&&(this.txtinput.value=this.data.cat.name,(t="0"===this.data.cat.pid?this.data.tree:this.findDataByID(this.data.cat.pid,this.data.tree.nodes))&&(t.selected=!0)),this.tree.data=this.data.tree,this.tree.expandAll()}findDataByID(t,e){var i,s,a;for(s=0,a=e.length;s\n \n \n \n \n \n \n
\n \n \n
\n \n \n',i=class extends this.OS.GUI.BasicDialog{constructor(t){super("BloggerCVSectionDiaglog",(t.meta().path+"/cvsection.html").asFileHandle())}main(){var t,e;return super.main(),this.editor=new SimpleMDE({autoDownloadFontAwesome:!1,element:this.find("contentarea"),status:!1,toolbar:!1}),$(this.select('[class = "CodeMirror-scroll"]')[0]).css("min-height","50px"),$(this.select('[class="CodeMirror cm-s-paper CodeMirror-wrap"]')[0]).css("min-height","50px"),t=this.select("[input-class='user-input']"),this.data&&this.data.section&&function(){var i,s,a;for(a=[],i=0,s=t.length;i{var s,a,n,r;for(s={},a=0,n=t.length;athis.resizeContent()),this.resizeContent()}resizeContent(){var t,e,i;return i=this.find("editor-container"),e=$(i).children(),t=$(i).height()-30,$(e[1]).css("height",t+"px")}},(a=class t extends this.OS.GUI.BasicDialog{constructor(t){super("BloggerSendmailDiaglog",(t.meta().path+"/sendmail.html").asFileHandle())}main(){var e,i;return super.main(),this.subdb=new this.parent._api.DB("subscribers"),this.maillinglist=this.find("email-list"),i=new RegExp("^#+(.*)\n","g").exec(this.data.content),this.find("mail-title").value=i[1],e=this.data.content.substring(0,500)+"...",this.find("contentarea").value=t.template.format(this.data.id,e),this.subdb.find({}).then(t=>{var e,i,s;for(e=0,i=t.length;ethis.error(__("Cannot fetch subscribers data: {0}",t.toString()),t)),this.find("bt-sendmail").onbtclick=t=>{var e,i,s,a,n,r;for(i=[],s=0,n=(a=this.maillinglist.items).length;st.error?this.notify(__("Unable to send mail to: {0}",t.result.join(", "))):this.quit()).catch(t=>(console.log(t),this.error(__("Error sending mail: {0}",t.toString()),t))))}}}).template="Hello,\n\nXuan Sang LE has just published a new post on his blog: https://blog.lxsang.me/post/id/{0}\n\n==========\n{1}\n==========\n\n\nRead the full article via:\nhttps://blog.lxsang.me/post/id/{0}\n\nYou receive this email because you have been subscribed to his blog.\n\nHave a nice day,\n\nSent from Blogger, an AntOS application",n=class extends this.OS.GUI.tag.ListViewItemTag{constructor(){super()}ondatachange(){var t,e,i,s,a,n;if(this.data){for(e in n=this.data,i=["content","start","end"],this.closable=n.closable,a=[],s=this.refs)t=s[e],n[e]&&""!==n[e]?i.includes(e)?a.push($(t).text(n[e])):a.push(t.text=n[e]):a.push(void 0);return a}}reload(){}init(){}itemlayout(){return{el:"div",children:[{el:"afx-label",ref:"title",class:"afx-cv-sec-title"},{el:"afx-label",ref:"subtitle",class:"afx-cv-sec-subtitle"},{el:"p",ref:"content",class:"afx-cv-sec-content"},{el:"p",class:"afx-cv-sec-period",children:[{el:"i",ref:"start"},{el:"i",ref:"end",class:"period-end"}]},{el:"afx-label",ref:"location",class:"afx-cv-sec-loc"}]}}},this.OS.GUI.tag.define("afx-blogger-cvsection-item",n),t=class extends this.OS.GUI.tag.ListViewItemTag{constructor(){super()}ondatachange(t){if(this.data)return(t=this.data).closable=!0,this.closable=t.closable,this.refs.title.text=t.title,this.refs.ctimestr.text=__("Created: {0}",t.ctimestr),this.refs.utimestr.text=__("Updated: {0}",t.utimestr)}reload(){}init(){}itemlayout(){return{el:"div",children:[{el:"afx-label",ref:"title",class:"afx-blogpost-title"},{el:"afx-label",ref:"ctimestr",class:"blog-dates"},{el:"afx-label",ref:"utimestr",class:"blog-dates"}]}}},this.OS.GUI.tag.define("afx-blogger-post-item",t)}).call(this); \ No newline at end of file +(function(){var t,e,i,s,a,n;(e=class extends this.OS.application.BaseApplication{constructor(t){super("Blogger",t)}main(){var t;return this.user={},this.cvlist=this.find("cv-list"),this.cvlist.ontreeselect=t=>{var e;if(t)return e=t.data.item.data,this.CVSectionByCID(Number(e.id))},this.inputtags=this.find("input-tags"),this.bloglist=this.find("blog-list"),this.seclist=this.find("cv-sec-list"),t=this.find("photo"),$(t).click(e=>this.openDialog("FileDialog",{title:__("Select image file"),mimes:["image/.*"]}).then(e=>t.value=e.file.path).catch(t=>this.error(__("Unable to get file"),t))),this.userdb=new this._api.DB("user"),this.cvcatdb=new this._api.DB("cv_cat"),this.cvsecdb=new this._api.DB("cv_sections"),this.blogdb=new this._api.DB("blogs"),this.tabcontainer=this.find("tabcontainer"),this.tabcontainer.ontabselect=t=>this.fetchData(t.data.container.aid),this.find("bt-user-save").onbtclick=t=>this.saveUser(),this.find("cv-cat-add").onbtclick=t=>{var e;return e=t=>this.openDialog(new s,{title:__("Add category"),tree:t}).then(t=>{var e;return e={name:t.value,pid:t.p.id,publish:1},this.cvcatdb.save(e).then(t=>this.refreshCVCat()).catch(t=>this.error(__("Cannot add new category"),t))}).catch(t=>this.error(t.toString(),t)),this.fetchCVCat().then(t=>e(t)).catch(t=>(e({text:"Porfolio",id:"0",nodes:[]}),this.error(__("Unable to fetch categories"),t)))},this.find("cv-cat-edit").onbtclick=t=>{var e,i;if((i=this.cvlist.selectedItem)&&(e=i.data))return this.fetchCVCat().then(t=>this.openDialog(new s,{title:__("Edit category"),tree:t,cat:e}).then(t=>{var i;return i={id:e.id,publish:e.publish,pid:t.p.id,name:t.value},this.cvcatdb.save(i).then(t=>this.refreshCVCat()).catch(t=>this.error(__("Cannot Edit category"),t))})).catch(t=>this.error(__("Unable to fetch categories"),t))},this.find("cv-cat-del").onbtclick=t=>{var e,i;if((i=this.cvlist.selectedItem)&&(e=i.data))return this.openDialog("YesNoDialog",{title:__("Delete category"),iconclass:"fa fa-question-circle",text:__("Do you really want to delete: {0}?",e.name)}).then(t=>{if(t)return this.deleteCVCat(e)}).catch(t=>this.error(t.toString(),t))},this.find("cv-sec-add").onbtclick=t=>{var e,s;if(s=this.cvlist.selectedItem)return(e=s.data)&&"0"!==e.id?this.openDialog(new i(this),{title:__("New section entry for {0}",e.name)}).then(t=>(t.cid=Number(e.id),t.start=Number(t.start),t.end=Number(t.end),this.cvsecdb.save(t).then(t=>this.CVSectionByCID(Number(e.id))).catch(t=>this.error(__("Cannot save section: {0}",t.toString()),t)))):this.notify(__("Please select a category"))},this.find("cv-sec-move").onbtclick=t=>{var e,i;return(i=this.find("cv-sec-list").selectedItem)?(e=i.data,this.fetchCVCat().then(t=>this.openDialog(new s,{title:__("Move to"),tree:t,selonly:!0}).then(t=>{var i;return i={id:e.id,cid:t.p.id},this.cvsecdb.save(i).then(t=>(this.CVSectionByCID(e.cid),this.find("cv-sec-list").unselect())).catch(t=>this.error(__("Cannot move section"),t))}))):this.notify(__("Please select a section to move"))},this.find("cv-sec-edit").onbtclick=t=>{var e,s;return(s=this.find("cv-sec-list").selectedItem)?(e=s.data,this.openDialog(new i(this),{title:__("Modify section entry"),section:e}).then(t=>(t.cid=Number(e.cid),t.start=Number(t.start),t.end=Number(t.end),this.cvsecdb.save(t).then(t=>this.CVSectionByCID(Number(e.cid))).catch(t=>this.error(__("Cannot save section: {0}",t.toString()),t))))):this.notify(__("Please select a section to edit"))},this.seclist.onitemclose=t=>{var e;if(t)return e=t.data.item.data,this.openDialog("YesNoDialog",{iconclass:"fa fa-question-circle",text:__("Do you really want to delete: {0}?",e.title)}).then(i=>{if(i)return this.cvsecdb.delete(e.id).then(e=>this.seclist.delete(t.data.item)).catch(t=>this.error(__("Cannot delete the section: {0}",t.toString()),t))}),!1},this.editor=new EasyMDE({element:this.find("markarea"),autoDownloadFontAwesome:!1,autofocus:!0,tabSize:4,indentWithTabs:!0,toolbar:[{name:__("New"),className:"fa fa-file",action:t=>(this.bloglist.unselect(),this.clearEditor())},{name:__("Save"),className:"fa fa-save",action:t=>this.saveBlog()},"|","bold","italic","heading","|","quote","code","unordered-list","ordered-list","|","link","image","table","horizontal-rule",{name:"image",className:"fa fa-file-image-o",action:t=>this.openDialog("FileDialog",{title:__("Select image file"),mimes:["image/.*"]}).then(t=>t.file.path.asFileHandle().publish().then(t=>this.editor.codemirror.getDoc().replaceSelection(`![](${this._api.handle.shared}/${t.result})`)).catch(t=>this.error(__("Cannot export file for embedding to text"),t)))},{name:"Youtube",className:"fa fa-youtube",action:t=>this.editor.codemirror.getDoc().replaceSelection("[[youtube:]]")},"|",{name:__("Preview"),className:"fa fa-eye no-disable",action:t=>(this.previewOn=!this.previewOn,EasyMDE.togglePreview(t),renderMathInElement(this.find("editor-container")))},"|",{name:__("Send mail"),className:"fa fa-paper-plane",action:t=>{var e,i;return(i=this.bloglist.selectedItem)?(e=i.data,this.openDialog(new a(this),{title:__("Send mail"),content:this.editor.value(),id:e.id}).then((function(t){return console.log("Email sent")}))):this.error(__("No post selected"))}}]}),this.bloglist.onlistselect=e=>{var i;if((t=this.bloglist.selectedItem)&&(i=t.data))return this.blogdb.get(Number(i.id)).then(t=>(this.editor.value(t.content),this.inputtags.value=t.tags,this.find("blog-publish").swon=!!Number(t.publish))).catch(t=>this.error(__("Cannot fetch the entry content"),t))},this.bloglist.onitemclose=e=>{var i;if(e)return t=e.data.item,i=t.data,this.openDialog("YesNoDialog",{title:__("Delete a post"),iconclass:"fa fa-question-circle",text:__("Do you really want to delete this post ?")}).then(e=>{if(e)return this.blogdb.delete(i.id).then(e=>(this.bloglist.delete(t),this.bloglist.unselect(),this.clearEditor()))}),!1},this.bindKey("CTRL-S",()=>{var t;if((t=this.tabcontainer.selectedTab)&&"blog-container"===t.container.aid)return this.saveBlog()}),this.on("resize",()=>this.resizeContent()),this.resizeContent(),this.loadBlogs()}fetchData(t){switch(t){case"user-container":return this.userdb.get(null).then(t=>{var e,i,s,a,n;for(this.user=t[0],a=[],e=0,s=(i=this.select("[input-class='user-input']")).length;ethis.error(__("Cannot fetch user data"),t));case"cv-container":return this.refreshCVCat();default:return this.loadBlogs()}}saveUser(){var t,e,i,s;for(t=0,i=(e=this.select("[input-class='user-input']")).length;tthis.notify(__("User data updated"))).catch(t=>this.error(__("Cannot save user data"),t)):this.notify(__("Full name must be entered"))}refreshCVCat(){return this.fetchCVCat().then(t=>(this.cvlist.data=t,this.cvlist.expandAll())).catch(t=>this.error(__("Unable to load categories"),t))}fetchCVCat(){return new Promise((t,e)=>{var i,s;return s={text:"Porfolio",id:"0",nodes:[]},i={order:{name:"ASC"}},this.cvcatdb.find(i).then(e=>(this.catListToTree(e,s,"0"),t(s))).catch((function(t){return e(__e(t))}))})}catListToTree(t,e,i){var s,a,n,r,o;if(0===(n=function(){var e,s,a;for(a=[],e=0,s=t.length;e(e=function(){var t,e,i;for(i=[],t=0,e=s.length;t(this.refreshCVCat(),this.seclist.data=[])).catch(e=>this.error(__("Cannot delete the category: {0} [{1}]",t.name,e.toString()),e)))).catch(e=>this.error(__("Cannot delete all content of: {0} [{1}]",t.name,e.toString()),e))}CVSectionByCID(t){var e;return e={exp:{"=":{cid:t}},order:{start:"DESC"}},this.cvsecdb.find(e).then(t=>{var e,i,s,a;for(i=[],this.find("cv-sec-status").text=__("Found {0} sections",t.length),e=0,s=t.length;ethis.error(t.toString(),t))}saveBlog(){var t,e,i,s,a,n,r;return s=void 0,(a=this.bloglist.selectedItem)&&(s=a.data),n=this.inputtags.value,t=this.editor.value(),(r=new RegExp("^#+(.*)\n","g").exec(t))&&2===r.length?""===n?this.notify(__("Please enter tags")):(e=new Date,i={content:t,title:r[1].trim(),tags:n,ctime:s?s.ctime:e.timestamp(),ctimestr:s?s.ctimestr:e.toString(),utime:e.timestamp(),utimestr:e.toString(),rendered:this.process(this.editor.options.previewRender(t)),publish:this.find("blog-publish").swon?1:0},s&&(i.id=s.id),this.blogdb.save(i).then(t=>this.loadBlogs()).catch(t=>this.error(__("Cannot save blog: {0}",t.toString()),t))):this.notify(__("Please insert a title in the text: beginning with heading"))}process(t){var e,i,s,a,n,r,o,l,h;for(i=function(t){return``},o=/\[\[youtube:([^\]]*)\]\]/g,l=[];null!==(s=o.exec(t));)l.push(s);if(!(l.length>0))return t;for(h="",e=0,a=0,r=l.length;a{var e,s;for(e=0,s=t.length;ethis.error(__("No post found: {0}",t.toString()),t))}resizeContent(){var t,e,i,s,a,n;return i=this.find("editor-container"),e=$(".EasyMDEContainer",i).children(),a=$(this.scheme).find(".afx-window-top")[0],n=e[0],s=e[3],t=$(this.scheme).height()-$(a).height()-$(n).height()-$(s).height()-90,$(e[1]).css("height",t+"px")}}).singleton=!0,e.dependencies=["pkg://SimpleMDE/main.js","pkg://SimpleMDE/main.css","pkg://Katex/main.js","pkg://Katex/main.css"],this.OS.register("Blogger",e),(s=class t extends this.OS.GUI.BasicDialog{constructor(){super("BloggerCategoryDialog",t.scheme)}main(){var t;if(super.main(),this.tree=this.find("tree"),this.txtinput=this.find("txtinput"),this.find("bt-ok").onbtclick=t=>{var e,i,s;return(e=this.tree.selectedItem)?(i=e.data,""!==(s=this.txtinput.value)||this.data.selonly?this.data.cat&&this.data.cat.id===i.id?this.notify(__("Parent can not be the category itself")):(this.handle&&this.handle({p:i,value:s}),this.quit()):this.notify(__("Please enter category name"))):this.notify(__("Please select a parent category"))},this.find("bt-cancel").onbtclick=t=>this.quit(),this.data&&this.data.tree)return this.data&&this.data.cat&&(this.txtinput.value=this.data.cat.name,(t="0"===this.data.cat.pid?this.data.tree:this.findDataByID(this.data.cat.pid,this.data.tree.nodes))&&(t.selected=!0)),this.tree.data=this.data.tree,this.tree.expandAll()}findDataByID(t,e){var i,s,a;for(s=0,a=e.length;s\n \n \n \n \n \n \n
\n \n \n
\n \n \n',i=class extends this.OS.GUI.BasicDialog{constructor(t){super("BloggerCVSectionDiaglog",(t.meta().path+"/cvsection.html").asFileHandle())}main(){var t,e;return super.main(),this.editor=new EasyMDE({autoDownloadFontAwesome:!1,element:this.find("contentarea"),status:!1,toolbar:!1}),$(this.select('[class = "CodeMirror-scroll"]')[0]).css("min-height","50px"),$(this.select('[class="CodeMirror cm-s-paper CodeMirror-wrap"]')[0]).css("min-height","50px"),t=this.select("[input-class='user-input']"),this.data&&this.data.section&&function(){var i,s,a;for(a=[],i=0,s=t.length;i{var s,a,n,r;for(s={},a=0,n=t.length;athis.resizeContent()),this.resizeContent()}resizeContent(){var t,e,i;return i=this.find("editor-container"),e=$(".EasyMDEContainer",i).children(),t=$(i).height()-30,$(e[0]).css("height",t+"px")}},(a=class t extends this.OS.GUI.BasicDialog{constructor(t){super("BloggerSendmailDiaglog",(t.meta().path+"/sendmail.html").asFileHandle())}main(){var e,i;return super.main(),this.subdb=new this.parent._api.DB("subscribers"),this.maillinglist=this.find("email-list"),i=new RegExp("^#+(.*)\n","g").exec(this.data.content),this.find("mail-title").value=i[1],e=this.data.content.substring(0,500)+"...",this.find("contentarea").value=t.template.format(this.data.id,e),this.subdb.find({}).then(t=>{var e,i,s;for(e=0,i=t.length;ethis.error(__("Cannot fetch subscribers data: {0}",t.toString()),t)),this.find("bt-sendmail").onbtclick=t=>{var e,i,s,a,n,r;for(i=[],s=0,n=(a=this.maillinglist.items).length;st.error?this.notify(__("Unable to send mail to: {0}",t.result.join(", "))):this.quit()).catch(t=>(console.log(t),this.error(__("Error sending mail: {0}",t.toString()),t))))}}}).template="Hello,\n\nXuan Sang LE has just published a new post on his blog: https://blog.lxsang.me/post/id/{0}\n\n==========\n{1}\n==========\n\n\nRead the full article via:\nhttps://blog.lxsang.me/post/id/{0}\n\nYou receive this email because you have been subscribed to his blog.\n\nHave a nice day,\n\nSent from Blogger, an AntOS application",n=class extends this.OS.GUI.tag.ListViewItemTag{constructor(){super()}ondatachange(){var t,e,i,s,a,n;if(this.data){for(e in n=this.data,i=["content","start","end"],this.closable=n.closable,a=[],s=this.refs)t=s[e],n[e]&&""!==n[e]?i.includes(e)?a.push($(t).text(n[e])):a.push(t.text=n[e]):a.push(void 0);return a}}reload(){}init(){}itemlayout(){return{el:"div",children:[{el:"afx-label",ref:"title",class:"afx-cv-sec-title"},{el:"afx-label",ref:"subtitle",class:"afx-cv-sec-subtitle"},{el:"p",ref:"content",class:"afx-cv-sec-content"},{el:"p",class:"afx-cv-sec-period",children:[{el:"i",ref:"start"},{el:"i",ref:"end",class:"period-end"}]},{el:"afx-label",ref:"location",class:"afx-cv-sec-loc"}]}}},this.OS.GUI.tag.define("afx-blogger-cvsection-item",n),t=class extends this.OS.GUI.tag.ListViewItemTag{constructor(){super()}ondatachange(t){if(this.data)return(t=this.data).closable=!0,this.closable=t.closable,this.refs.title.text=t.title,this.refs.ctimestr.text=__("Created: {0}",t.ctimestr),this.refs.utimestr.text=__("Updated: {0}",t.utimestr)}reload(){}init(){}itemlayout(){return{el:"div",children:[{el:"afx-label",ref:"title",class:"afx-blogpost-title"},{el:"afx-label",ref:"ctimestr",class:"blog-dates"},{el:"afx-label",ref:"utimestr",class:"blog-dates"}]}}},this.OS.GUI.tag.define("afx-blogger-post-item",t)}).call(this); \ No newline at end of file diff --git a/Blogger/build/debug/package.json b/Blogger/build/debug/package.json index 9700097..29dc296 100644 --- a/Blogger/build/debug/package.json +++ b/Blogger/build/debug/package.json @@ -6,9 +6,9 @@ "author": "Xuan Sang LE", "email": "xsang.le@gmail.com" }, - "version":"0.2.8-a", + "version":"0.2.9-a", "category":"Internet", "iconclass":"fa fa-book", - "dependencies": ["SimpleMDE@1.11.2-r","Katex@0.11.1-r"], + "dependencies": ["SimpleMDE@2.18.0-r","Katex@0.11.1-r"], "mimes":["none"] } \ No newline at end of file diff --git a/Blogger/build/release/Blogger.zip b/Blogger/build/release/Blogger.zip index 7806afc9b5c4106ae5e0b82e952568005c650da4..a1c602632156b59760697da89bbece59c1a3e2b2 100644 GIT binary patch delta 6310 zcmZvgbx<5ol812(I)es+4DJ#jxH|y`cLE6xgS!k6+#P}j_klog3pz+}2@)h|(BKSy z+1;z!+q-*zb-n6-{p;%PdR5<@Vu2D=Qxz2r2MGxY3rVyCq}SpMkrV(TAq7e!Az}W# zb+WL7aM`4D^X+a>Ea{48r=L8UmUI*!N;d6w7X$n3lX zQJnlxn`_KVH-U_qXs_vYs(IZjiI)g{s`yaU%`GQE@Nj7@SNAY=Oi0$oAzbG(qXzSY0q5wYDm)XZOmp-F)m~uGiodSK-1CZNr7jI z;DK9y=*nAiS(%Ps;&vzVTaV7e=|DDTTZO5<`T9oYA43p9QM5Z68KOgsDK%f!r_U#FYNd!D#Ljq+X&eXcy5P5-pc={KBszJNLvG zMK=e_M^;lHBLIAE?|C+ho+|BQ(8y(wPd3wUCT`T$p}Dwy`UXldwyBjtZ;nxAJU2Y} zUB528KZ}YUnZS#9!f6v~o)$|F2&b|5__UaKZmB+m0*J&fneflo)tdxNBW0=Ty8 zFX^Sb*$AT#=e{PK-TrVf_;tqnLWgAsNA`y~KI9CH?h{*jDL~togZ<|qq~4D^zNEyTQ` ztn-kEz}@9s{C&e&H@q6J1ui>nOP(W#X)CC%r44S?5;Bl>1n)-&z=gIFg z8n!kxj6$4L>_VwevU)lZC5GU$#2S74$YhOIP`0!<2X0o68p2uw3#-CNd+&ubz)8Ye z0vqkbSlPs0wL~0risj^S>F6!_%Jb)zn)c`G@s)R&G7h%81H7RE?2nG@M`BR8JH6 zRdCpIB+YFjea@Dw5=KD?H~YlyyNWtv=sGE}+yju6N21vmJmEXCw`?aDw3i(5f&N(v zt+HXDyyR=_Z~7m1Wa+X?6+dTQb|J4gLzBco^KaPvIuP5s+(eM7)hu1PEB1^@{sbwj zloiPE3?(VRc_B1SPyzd)Oli7qJ14HxggcZl-8`}EM{lF4b~Frl)@meuyL%6KZK2sT zt_gj-YgIn&cndyoGv48+dU8^C1EDhA!ww1hcMD=`e@;Y@2Ra*zh&^Sk-p*D+>G<2a zujB0nDDMJCoCoSjPW?}I25q_6YMD*_7k?M7?~H)&h4~cl$m&h3f2twFDbk~eIv+^g z9z>wkcoHrz%>FoR>)cp4_h!=ms{J$^ki+gG=%`H6|b4tQev%PB_1&+8UA zaP7%z@&|vPT;j#6zQYf3RSdU;AWdd$z~-`NN`$l0p5rAcoAL>RL+$F=q6^aztry0W zOy@UQ+z7gN6Int#QZ4Afwjb~UK zN8~Hq$1a={)}_GqJ8-nZVSgKqNYXD@laFE$(^{;a!W6crAoK5oxqiBOk|Ud>T}g!a zz}ZuzvqEMNFf5{OX1YrP0XbHt40Q?@WIF9X zcsgOdK4b)fvXVzw`^F_-lM`y}IijdPRnx;3%LYJ#n}J=HdmE$(Xmr%m}RX3J4& z{N|5Qw;aQ=eBIW~cCf0GL!Phcl%m0$mo>2w{vR-xt0sV=SXC5IYlW8@A~_f6vOZ3p zuD;#Qg!(s^vKKf3MA$kvTetM)G5pxwI@krHhZw*Dy=;P!#?LbxIR2QlXDBiyW||s( z;&*s^utiVC59S^zB;{(i)92GGkki6|yIK391T;VNsZ4_m#l!OjV?@-a^N2KBtvTDV z_cttl6s@gjYqws9leiAi-C)idCRb9nbRAqFQg=qhf%Fpj73}} zU2MKU&WNESoggt@;l;x-T5r&p=la2$!TXfr+|c<@z6D&}$`%pel5lg4 z%dz<5YRd>q_(FSar<9HYx-gvA#59RHuU|4djdjOc?BfyC$Y1lD|F^6yJe)fQA~<~L z6c^t4ahdXI;4WmvgVSS7o-kBVdDm}*|tOK)HJ+%8=BlH7yCax+ki1vduc4O1~n z9+n==llW3uJ761-{_8{RJ1+i*!_!}`w^p`@MrCmztZ zNFQf-*7_)X$R$4Uxv}Kn_zi9Qo@wb3vrZ|*|4*Vmj-o(rDO z=%b#A&31yex#^UH;My_7a5yx4mMgwuB2dNe;sUjzEM_~ud!JDK^X+R?Hyw3X7)%Ld z`Y~;G_K@7s5TMWVAw`jpE%coye!R{)mVpVh7|Y@iPo(s&&{1USqXX5n*Skfp`f>#% zM1UpjNBSMz`6{y5_!(nd=7-N1gsKOi@yOVLi`fw$8eN^PzODZCc}29c6AH0k9y8Dxn4GET$(-`}0QImU%N@gd0zYGSR>vPWz>OjfBMLI; zw1!AfAS)@O*plwauf%SKG@ovn5=4LpXt(p!bE`IMOm`Fdbn_*#a?p(t@Z2~%8K@zo zZ?-rl~x78J}P9<9HME>h%KS|ij>ok-hKO`=Y&=7azW_UwFnLa^f(k_7nw zu$sfPN-%D9pAL4S&CaULf4xaft=@;~#+#wfLd{Ig`*mP-FpUf_My8K~GER!~q9xdP z!Z6FO02~f{Obq=_K3(mK`kp1jqNf}Cd8^5=tDz{D zz5FTocT*h)`ZS*&xo~M|xy9K{ z+5$3kd`O~=qGCMH8by+LjN==bP&(!fb-8?zyc{@ctdV|kS+IrGF5e6&KXvMcAZeQ+ zaztqaBrnNwrK=QF;=Ypz??qTj=i{&mJd8&&227V4IP)bq?sDmoY3D;7O-~taCjI=W`C)_A4QwY|8N#W> z!l}JN##5P4==vqd0n*j$&*wg5|nRsO8}Xc?@~Y(D)swxK%2Y=*8WjIElLd;94QLlPKpA%4_WQveyoKF9jQvkL1Ta` z(ZnBO9`^{iVSMO~YO0K>__L!}w;v?6qIwTn4A&Ro)slr+4^pSe zibGuvOcnO}ty4j{ntYY;X z0SGCk89JzJe7t_?rMdbv+|Fepi%31xs@fm9$K#{)lv^&hCRM$4I37~(JfYMdFt*`n zm!&QEfl?tlIf&O_kB~$N?A&(3+`lTnqMtMo^sB(R*hWKb99sC%zl^rjc29 z)b)O5u^f8YipD)x9U0v%)|+nGguAdawZJG;~DUa5x~QABC7AK6prz(8OEq-eFUw14kDBG=D4 zH*ZD)l|HY5U5hH>PL_L8dmhs2It%-1)*ENa7K6`Jf8bqnXvVpcb`>K{6YNh$#gU!^h%;<g>~hg|Q`ohDnLIHvAmi(MV>x-YQHk_Az?~q)D3IsH$t{rD^gVr zPKV>aoW)EU@`qd4k?-Eb>Uz`|&8knw-nkjyd)us>?R}~8RdQ$`EN|Z+JqH8o@~0i{ z9S$G&ths9-p*t3B$ce7rx}?W4)gEpBo;Za=R~TBuBx?8>F=zYmv1+ONt(WG`k!wl= z*F#U($!f!Wu%cr538M<*!rDZ(Hez(`eZMTHao`2-Q*E%*eew^T&Y?pQ$yv8Hr&<`e zw1us!P#9~g%npBjUC%Q^pm+fK9AjfhWV)k&`|Jq5Fy|vg?AEqerr*4jX9c`QPW5ed+#Q)nPua`~`M)`&yG095;6_zIR+%%u5K$JAE4?V$njs zQ$OfGn5&Aj65C+lKeVd&s`W}FbKTT$!Z{>xap9Mmd4rW2{7SMAg~4Y}{N+$xUtn@7 zK#3?WGXSZ&r22f}Y=6tkb0b+Ofi&OA{)*z22{ra6K(%4RIFRua~*^OA$oK$`^G94eAqjPE<#P@kyCc}NyovH{{F3tad5?KDE|I7P zP8RA>pd;$BSrO_$u*jX16+egYqW#fM7>OvhHj-5~q=l;*Czu@m8L;pcw z;q!+L)yPOlTPR3K*nbJEmb|pwTX`<054tH}hZP=R`1&I|{4vd>SnAfj%gdGCL2bt_ef^mn&z&YV zCr4**K}hz~OA#x>W}{zIEcyUw2|&B6&o1@P`Gt{{`DvMf5CXiR;S2;UzK=S0z)Dbf zxVw#7$dC@VBZ6|fP~ELz=F_EZ{Q!C0GD&i$IHTtuQGlgHt&GJw#Z?O<-x(%F`Vp;> zMRWCzGi4OLV?(8hQ}YK0a-P0ZL&5$1k~{94F?h6PfxDrDz>pielpPOxwW*;#RvWvk z_aYFhgn}FXWBr{-BTJLeg6S78^lRC86>F^h1lqT@f3m2!i^lz8_qZ&S(5BpniSh2G zuDt>GO3fB0O=~l_;v;DOv%8JO6#1xV|7dR` zHmV%Tzbtv`2;_fR5ws=968|55|J(onasC^|YpNon0FnO9?Ekee&h#X-Mt{k@i^Y2f z3mdDy(B2vHzdcjA=qXX0NK#eksc8SdS^IY`eX`U75ZOP~r4oQBky%sOK$QQCLE9`k zqW?RaIDZ9T{X5{VHAa>Cjh1yUp delta 6329 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 super.main() - @editor = new SimpleMDE + @editor = new EasyMDE autoDownloadFontAwesome: false element: @find "contentarea" status: false @@ -107,14 +107,14 @@ class BloggerCVSectionDiaglog extends this.OS.GUI.BasicDialog @handle data if @handle @quit() - @on "vboxchange", () => @resizeContent() + @on "resize", () => @resizeContent() @resizeContent() resizeContent: () -> container = @find "editor-container" - children = ($ container).children() + children = ($ ".EasyMDEContainer", container).children() cheight = ($ container).height() - 30 - ($ children[1]).css("height", cheight + "px") + ($ children[0]).css("height", cheight + "px") # this dialog is for send mail diff --git a/Blogger/main.coffee b/Blogger/main.coffee index e601d2b..9925b49 100644 --- a/Blogger/main.coffee +++ b/Blogger/main.coffee @@ -187,7 +187,7 @@ class Blogger extends this.OS.application.BaseApplication .catch (e) => @error __("Cannot delete the section: {0}", e.toString()), e return false - @editor = new SimpleMDE + @editor = new EasyMDE element: @find "markarea" autoDownloadFontAwesome: false autofocus: true @@ -237,7 +237,7 @@ class Blogger extends this.OS.application.BaseApplication className: "fa fa-eye no-disable", action: (e) => @previewOn = !@previewOn - SimpleMDE.togglePreview e + EasyMDE.togglePreview e #/console.log @select ".editor-preview editor-preview-active" renderMathInElement @find "editor-container" }, @@ -294,7 +294,7 @@ class Blogger extends this.OS.application.BaseApplication sel = @tabcontainer.selectedTab return unless sel and sel.container.aid is "blog-container" @saveBlog() - @on "vboxchange", () => + @on "resize", () => @resizeContent() @resizeContent() @@ -489,12 +489,12 @@ class Blogger extends this.OS.application.BaseApplication resizeContent: () -> container = @find "editor-container" - children = ($ container).children() + children = ($ ".EasyMDEContainer", container).children() titlebar = (($ @scheme).find ".afx-window-top")[0] - toolbar = children[1] - statusbar = children[4] + toolbar = children[0] + statusbar = children[3] cheight = ($ @scheme).height() - ($ titlebar).height() - ($ toolbar).height() - ($ statusbar).height() - 90 - ($ children[2]).css("height", cheight + "px") + ($ children[1]).css("height", cheight + "px") Blogger.singleton = true Blogger.dependencies = [ diff --git a/Blogger/package.json b/Blogger/package.json index 9700097..29dc296 100644 --- a/Blogger/package.json +++ b/Blogger/package.json @@ -6,9 +6,9 @@ "author": "Xuan Sang LE", "email": "xsang.le@gmail.com" }, - "version":"0.2.8-a", + "version":"0.2.9-a", "category":"Internet", "iconclass":"fa fa-book", - "dependencies": ["SimpleMDE@1.11.2-r","Katex@0.11.1-r"], + "dependencies": ["SimpleMDE@2.18.0-r","Katex@0.11.1-r"], "mimes":["none"] } \ No newline at end of file diff --git a/Booklet/README.md b/Booklet/README.md index d34fb51..171b9e9 100644 --- a/Booklet/README.md +++ b/Booklet/README.md @@ -3,6 +3,8 @@ A back-end tool for my online document hub [https://doc.iohub.dev/antos/](https: ## Change logs +### v0.2.5-a +* Use the new MDE library ### v0.2.3-a * Chage app category name ### v0.2.1-a diff --git a/Booklet/build/debug/README.md b/Booklet/build/debug/README.md index d34fb51..171b9e9 100644 --- a/Booklet/build/debug/README.md +++ b/Booklet/build/debug/README.md @@ -3,6 +3,8 @@ A back-end tool for my online document hub [https://doc.iohub.dev/antos/](https: ## Change logs +### v0.2.5-a +* Use the new MDE library ### v0.2.3-a * Chage app category name ### v0.2.1-a diff --git a/Booklet/build/debug/main.js b/Booklet/build/debug/main.js index 38a0cd1..49643d9 100644 --- a/Booklet/build/debug/main.js +++ b/Booklet/build/debug/main.js @@ -1 +1 @@ -(function(){var t,e,i,r,n,a,s,o;(t=class extends this.OS.application.BaseApplication{constructor(t){super("Booklet",t)}main(){return this.tree=this.find("toc-ui"),this.currentToc=void 0,this.dirty=!1,this.emux=!1,this.on("treeselect",t=>{var e;return e=t.data.item.data,this.currentToc===e||void 0===e||0===e.treepath?this.reloadEditor():(e.treepath=e.path,this.load(e).then(()=>this.open(e)).catch(t=>(e.loaded=!0,this.open(e),this.error(__("Error when loading '{0}': {1}",e.text,t.toString()),t))))}),this.tree.ondragndrop=t=>this.dndhandle(t),this.initEditor(),this.resizeContent(),this.tree.contextmenuHandle=(t,e)=>{var i;if(i=this.contextMenu())return e.items=i,e.onmenuselect=t=>this[t.data.item.data.dataid](),e.show(t)},this.editor.codemirror.on("change",()=>{if(!this.emux&&this.currentToc)return this.currentToc.descFile.dirty=!0,this.dirty=!0})}newChapter(){var t;return this.currentToc&&"Book"===this.currentToc.type?(t=new i(this.book),this.displayToc(),t.treepath=t.path):this.error(__("No book selected"))}newSection(){var t;return this.currentToc&&"Chapter"===this.currentToc.type?(t=new s(this.currentToc),this.displayToc(),t.treepath=t.path):this.error(__("No chapter selected"))}newFile(){var t;return this.currentToc&&"Section"===this.currentToc.type?(t=new n(this.currentToc),this.displayToc(),t.treepath=t.path):this.error(__("No section selected"))}delete(){var t;return this.currentToc?(t=()=>(this.currentToc=void 0,this.displayToc(),this.reloadEditor()),this.currentToc.remove().then(()=>(this.notify(__("Entrie deleted")),t())).catch(e=>(this.error(e.toString(),e),t()))):this.error(__("No entrie select"))}goUp(){if(this.currentToc&&"Book"!==this.currentToc.type)return this.currentToc.parent.up(this.currentToc),this.displayToc()}goDown(){if(this.currentToc&&"Book"!==this.currentToc.type)return this.currentToc.parent.down(this.currentToc),this.displayToc()}load(t){return new Promise((e,i)=>t.loaded?e():t.descFile.meta().then(r=>t.descFile.read().then(i=>(t.descFile.cache=i,t.loaded=!0,t.descFile.dirty=!1,e())).catch((function(t){return i(__e(t))}))).catch((function(t){return i(__e(t))})))}dndhandle(t){var e,i;if(t&&t.data&&(e=t.data.from[0].data,i=t.data.to.data,e&&i&&"Book"!==e.type&&"Chapter"!==e.type&&e.parent!==i.parent&&e.parent!==i))return i.type===e.type&&(i=i.parent),i.type===e.parent.type?e.parent.removeChild(e).then(()=>(i.add(e),this.displayToc())):void 0}upload(){if(this.currentToc&&"File"!==this.currentToc.type)return this.currentToc.path.asFileHandle().upload().then(()=>this.notify(__("File uploaded"))).catch(t=>this.error(__("Unable to upload file {0}",t.toString()),t))}contextMenu(){if(this.currentToc)switch(this.currentToc.type){case"Book":return[{text:__("New chapter"),dataid:"newChapter"},{text:__("Delete book"),dataid:"delete"},{text:__("Upload media"),dataid:"upload"}];case"Chapter":return[{text:__("New section"),dataid:"newSection"},{text:__("Delete chapter"),dataid:"delete"},{text:__("Go up"),dataid:"goUp"},{text:__("Go down"),dataid:"goDown"},{text:__("Upload media"),dataid:"upload"}];case"Section":return[{text:__("New file"),dataid:"newFile"},{text:__("Delete section"),dataid:"delete"},{text:__("Go up"),dataid:"goUp"},{text:__("Go down"),dataid:"goDown"},{text:__("Upload media"),dataid:"upload"}];case"File":return[{text:__("Delete file"),dataid:"delete"},{text:__("Go up"),dataid:"goUp"},{text:__("Go down"),dataid:"goDown"}]}}shareFile(t,e){return this.openDialog("FileDialog",{title:__("Select a file"),mimes:t}).then(t=>t.file.path.asFileHandle().publish().then((function(t){return e(t.result)})).catch(t=>this.error(__("Cannot export file for embedding to text"),t))).catch(t=>this.error(t.toString(),t))}initEditor(){var t;return t=this.find("markarea"),this.container=this.find("mycontainer"),this.previewOn=!1,this.editormux=!1,this.editor=new SimpleMDE({element:t,autoDownloadFontAwesome:!1,autofocus:!0,tabSize:4,indentWithTabs:!0,toolbar:["bold","italic","heading","|","quote","code","unordered-list","ordered-list","|","link","image","table","horizontal-rule",{name:"shared image",className:"fa fa-share-square",action:t=>this.shareFile(["image/.*"],t=>this.editor.codemirror.getDoc().replaceSelection(`![](${this._api.handler.shared}/${t})`))},{name:"local image",className:"fa fa-file-image-o",action:t=>{if(this.book)return this.openDialog("FileDialog",{title:__("Select image file"),mimes:["image/.*"],root:this.book.path}).then(t=>{var e;return e=t.file.path.replace(this.book.path,""),this.editor.codemirror.getDoc().replaceSelection(`[[@book:image:${e}]]`)}).catch(t=>this.error(t.toString(),t))}},{name:"Youtube",className:"fa fa-youtube",action:t=>{var e,i;return e=this.editor.codemirror.getDoc(),i=this.editor.codemirror.getSelection()||"",e.replaceSelection(`[[youtube:${i}]]`)}},{name:"3d object",className:"fa fa-cube",action:t=>{if(this.book)return this.openDialog("FileDialog",{title:__("Select 3d model"),mimes:["text/wavefront-obj","model/gltf-binary"],root:this.book.path}).then(t=>{var e;return e=t.file.path.replace(this.book.path,""),this.editor.codemirror.getDoc().replaceSelection(`[[@book:3dmodel:${e}]]`)}).catch(t=>this.error(t.toString(),t))}},"|",{name:__("Preview"),className:"fa fa-eye no-disable",action:t=>(SimpleMDE.togglePreview(t),renderMathInElement(this.find("mycontainer")),this.renderLocalElement())}],previewRender:(t,e)=>{var i;return this.book&&(t=t.replace(/\[\[@book:image:([^\]]*)\]\]/g,(t,e)=>`![](${this._api.handle.get}/${this.book.path}/${e})`)),i=this.editor.markdown(t),e.innerHTML=i}}),this.on("hboxchange",t=>this.resizeContent()),this.bindKey("ALT-N",()=>this.actionFile(this.name+"-New")),this.bindKey("ALT-O",()=>this.actionFile(this.name+"-Open")),this.bindKey("CTRL-S",()=>this.actionFile(this.name+"-Save"))}reloadEditor(){return void 0===this.currentToc?(this.editor.value(""),this.scheme.apptitle=this.name):(this.editor.value(this.currentToc.descFile.cache||""),this.scheme.apptitle="Booklet - "+this.currentToc.descFile.path)}saveContext(){if(this.currentToc)return this.currentToc.descFile.cache=this.editor.value()}resizeContent(){var t,e,i,r,n;return e=$(this.container).children(),r=$(this.scheme).find(".afx-window-top")[0],n=e[1],i=e[4],t=$(this.scheme).height()-$(r).height()-$(n).height()-$(i).height()-40,$(e[2]).css("height",t+"px")}menu(){return[{text:"__(File)",nodes:[{text:"__(New booklet)",dataid:this.name+"-New",shortcut:"A-N"},{text:"__(Open a booklet)",dataid:this.name+"-Open",shortcut:"A-O"},{text:"__(Save a booklet)",dataid:this.name+"-Save",shortcut:"C-S"}],onchildselect:t=>this.actionFile(t.data.item.data.dataid)}]}actionFile(t){switch(t){case this.name+"-Open":return this.checkForDirty(()=>this.openDialog("FileDialog",{title:__("Open book"),mimes:["dir"]}).then(t=>(this.book=new e(t.file.path),this.book.read(t.file.path).then(()=>(this.book.treepath=this.book.path,this.tree.selectedItem=void 0,this.displayToc(),this.notify(__("Book loaded")))).catch(t=>this.error(__("Cannot load book: {0}",t.toString()),t)))).catch(t=>this.error(t.toString(),t)));case this.name+"-New":return this.openDialog("FileDialog",{title:__("New book at"),mimes:["dir"],file:{basename:__("BookName")}}).then(t=>this.newAt(`${t.file.path}/${t.name}`)).catch(t=>this.error(t.toString(),t));case this.name+"-Save":if(!this.book)return;return this.currentToc&&this.saveContext(),this.displayToc(),this.book.save().then(()=>(this.dirty=!1,this.notify(__("Book saved")))).catch(t=>this.error(__("Can't save the book : {0}",t.toString()),t))}}checkForDirty(t){return this.dirty?this.ask({title:__("Continue ?"),text:__("Book is unsaved, you want to continue ?")}).then(e=>{if(e)return t()}):t()}open(t){return this.emux=!0,this.saveContext(),this.currentToc=t,this.reloadEditor(),this.displayToc(),this.emux=!1}newAt(t){return this.tree.selectedItem=void 0,this.book=new e(t),this.book.treepath=this.book.path,this.currentToc=void 0,this.reloadEditor(),this.displayToc()}displayToc(){return this.book.toc(),this.tree.data=this.book,this.tree.expandAll()}cleanup(t){if(this.dirty)return t.preventDefault(),this.checkForDirty(()=>(this.dirty=!1,this.quit()))}renderLocalElement(){}}).dependencies=["pkg://SimpleMDE/main.js","pkg://SimpleMDE/main.css","pkg://Katex/main.js","pkg://Katex/main.css"],this.OS.register("Booklet",t),r=class{constructor(t){this.text=t,this.loaded=!0}save(){}remove(){}toc(){}updateName(){var t;return(t=new RegExp("^s*#+(.*)\n","g").exec(this.descFile.cache))&&2===t.length?(this.hasMeta&&this.metaFile&&(this.metaFile.dirty=!0),this.parent&&this.parent.hasMeta&&this.parent.metaFile&&(this.parent.metaFile.dirty=!0),this.text=t[1].trim()):this.text}remove(){return new Promise((t,e)=>{var i;return(i=this.path.asFileHandle()).meta().then(r=>i.remove().then(i=>this.parent?this.parent.removeChild(this).then((function(){return t()})).catch((function(t){return e(__e(t))})):t()).catch((function(t){return e(__e(t))}))).catch(i=>this.parent?this.parent.removeChild(this).then((function(){return t()})).catch((function(t){return e(__e(t))})):t())})}},a=class extends r{constructor(t,e,i){super("Untitle"),this.type=t,this.path=e,this.hasMeta=i,this.init()}init(){return this.cnt=0,this.nodes=[],this.hasMeta&&(this.metaFile=(this.path+"/meta.json").asFileHandle()),this.descFile=(this.path+"/INTRO.md").asFileHandle()}up(t){var e;if(t&&(e=this.nodes.indexOf(t))>0)return this.nodes.splice(e,1),this.nodes.splice(e-1,0,t)}down(t){var e;if(t&&(e=this.nodes.indexOf(t))>=0&&e(this.nodes.splice(this.nodes.indexOf(t),1),this.hasMeta&&this.metaFile?(this.metaFile.dirty=!0,this.updateMeta().then((function(){return e()})).catch((function(t){return i(__e(t))}))):e()))}read(t){return new Promise((e,i)=>(this.path=t,this.init(),this.loaded=!1,this.metaFile.meta().then(t=>this.metaFile.read("json").then(t=>{var i,r,n,a,s,h,c;for(this.text=t.name,s=[],r=n=0,a=(h=t.entries).length;n{var n,a;return 0===r.length?(this.cnt=t.cnt,e()):(n=r.splice(0,1)[0],(a=new o[n.type](this)).name=n.name,a.read(n.path.replace("book://",this.root)).then(()=>i(r)).catch(t=>i(r)))})(s)}).catch((function(t){return i(__e(t))}))).catch((function(t){return i(__e(t))}))))}size(){return this.nodes.length}mkdir(){return new Promise((t,e)=>{var i;return(i=this.path.asFileHandle()).meta().then(e=>t()).catch(r=>{var n;return n=i.basename,(i=i.parent().asFileHandle()).mk(n).then(e=>t()).catch((function(t){return e(__e(t))}))})})}mkdirs(){return new Promise((t,e)=>{var i,r,n,a,s,o;if(a=[],"Section"!==this.type)for(i=r=0,n=(s=this.nodes).length;r{var i;return(i=r=>0===r.length?t():r.splice(0,1)[0].mkdirs().then(()=>i(r)).catch((function(t){return e(__e(t))})))(a)}).catch((function(t){return e(__e(t))}))})}updateMeta(){return new Promise((t,e)=>{var i,r,n,a,s,o,h;if(!this.metaFile.dirty)return t();for(r=[],n=a=0,s=(o=this.nodes).length;a(this.metaFile.dirty=!1,t())).catch((function(t){return e(__e(t))}))})}update(){return new Promise((t,e)=>this.updateMeta().then(()=>this.descFile.dirty?this.descFile.write("text/plain").then(e=>(this.descFile.dirty=!1,t())).catch((function(t){return e(__e(t))})):t()).catch((function(t){return e(__e(t))})))}updateAll(){return new Promise((t,e)=>{var i,r,n,a,s,o;for(a=[],i=r=0,n=(s=this.nodes).length;r{var i;return(i=r=>0===r.length?t():r.splice(0,1)[0].updateAll().then(()=>i(r)).catch((function(t){return e(__e(t))})))(a)}).catch((function(t){return e(__e(t))}))})}toc(){var t,e,i;for(this.updateName(),t=0,e=(i=this.nodes).length;tthis.mkdirs().then(()=>this.updateAll().then(()=>t()).catch((function(t){return e(__e(t))}))).catch((function(t){return e(__e(t))})))}},Chapter:i=class extends a{constructor(t){super("Chapter",`${t.path}/c_${t.cnt}`,!0),t.add(this)}},Section:s=class extends a{constructor(t){super("Section",`${t.path}/s_${t.cnt}`,!0),t.add(this)}},File:n=class extends r{constructor(t){super("Untitle file"),this.section=t,this.hasMeta=!1,this.type="File",this.path=`${this.section.path}/f_${this.section.cnt}.md`,this.descFile=this.path.asFileHandle(),this.section.add(this)}updateAll(){return new Promise((t,e)=>this.descFile.dirty?this.descFile.write("text/plain").then(e=>(this.descFile.dirty=!1,t())).catch(t=>e(__e(t))):t())}read(t){return new Promise((e,i)=>(this.loaded=!1,this.treepath=t,this.path=t,this.descFile=this.path.asFileHandle(),e()))}toc(){return this.updateName(),this}}}}).call(this); \ No newline at end of file +(function(){var t,e,i,r,n,a,s,o;(t=class extends this.OS.application.BaseApplication{constructor(t){super("Booklet",t)}main(){return this.tree=this.find("toc-ui"),this.currentToc=void 0,this.dirty=!1,this.emux=!1,this.on("treeselect",t=>{var e;return e=t.data.item.data,this.currentToc===e||void 0===e||0===e.treepath?this.reloadEditor():(e.treepath=e.path,this.load(e).then(()=>this.open(e)).catch(t=>(e.loaded=!0,this.open(e),this.error(__("Error when loading '{0}': {1}",e.text,t.toString()),t))))}),this.tree.ondragndrop=t=>this.dndhandle(t),this.initEditor(),this.resizeContent(),this.tree.contextmenuHandle=(t,e)=>{var i;if(i=this.contextMenu())return e.items=i,e.onmenuselect=t=>this[t.data.item.data.dataid](),e.show(t)},this.editor.codemirror.on("change",()=>{if(!this.emux&&this.currentToc)return this.currentToc.descFile.dirty=!0,this.dirty=!0})}newChapter(){var t;return this.currentToc&&"Book"===this.currentToc.type?(t=new i(this.book),this.displayToc(),t.treepath=t.path):this.error(__("No book selected"))}newSection(){var t;return this.currentToc&&"Chapter"===this.currentToc.type?(t=new s(this.currentToc),this.displayToc(),t.treepath=t.path):this.error(__("No chapter selected"))}newFile(){var t;return this.currentToc&&"Section"===this.currentToc.type?(t=new n(this.currentToc),this.displayToc(),t.treepath=t.path):this.error(__("No section selected"))}delete(){var t;return this.currentToc?(t=()=>(this.currentToc=void 0,this.displayToc(),this.reloadEditor()),this.currentToc.remove().then(()=>(this.notify(__("Entrie deleted")),t())).catch(e=>(this.error(e.toString(),e),t()))):this.error(__("No entrie select"))}goUp(){if(this.currentToc&&"Book"!==this.currentToc.type)return this.currentToc.parent.up(this.currentToc),this.displayToc()}goDown(){if(this.currentToc&&"Book"!==this.currentToc.type)return this.currentToc.parent.down(this.currentToc),this.displayToc()}load(t){return new Promise((e,i)=>t.loaded?e():t.descFile.meta().then(r=>t.descFile.read().then(i=>(t.descFile.cache=i,t.loaded=!0,t.descFile.dirty=!1,e())).catch((function(t){return i(__e(t))}))).catch((function(t){return i(__e(t))})))}dndhandle(t){var e,i;if(t&&t.data&&(e=t.data.from[0].data,i=t.data.to.data,e&&i&&"Book"!==e.type&&"Chapter"!==e.type&&e.parent!==i.parent&&e.parent!==i))return i.type===e.type&&(i=i.parent),i.type===e.parent.type?e.parent.removeChild(e).then(()=>(i.add(e),this.displayToc())):void 0}upload(){if(this.currentToc&&"File"!==this.currentToc.type)return this.currentToc.path.asFileHandle().upload().then(()=>this.notify(__("File uploaded"))).catch(t=>this.error(__("Unable to upload file {0}",t.toString()),t))}contextMenu(){if(this.currentToc)switch(this.currentToc.type){case"Book":return[{text:__("New chapter"),dataid:"newChapter"},{text:__("Delete book"),dataid:"delete"},{text:__("Upload media"),dataid:"upload"}];case"Chapter":return[{text:__("New section"),dataid:"newSection"},{text:__("Delete chapter"),dataid:"delete"},{text:__("Go up"),dataid:"goUp"},{text:__("Go down"),dataid:"goDown"},{text:__("Upload media"),dataid:"upload"}];case"Section":return[{text:__("New file"),dataid:"newFile"},{text:__("Delete section"),dataid:"delete"},{text:__("Go up"),dataid:"goUp"},{text:__("Go down"),dataid:"goDown"},{text:__("Upload media"),dataid:"upload"}];case"File":return[{text:__("Delete file"),dataid:"delete"},{text:__("Go up"),dataid:"goUp"},{text:__("Go down"),dataid:"goDown"}]}}shareFile(t,e){return this.openDialog("FileDialog",{title:__("Select a file"),mimes:t}).then(t=>t.file.path.asFileHandle().publish().then((function(t){return e(t.result)})).catch(t=>this.error(__("Cannot export file for embedding to text"),t))).catch(t=>this.error(t.toString(),t))}initEditor(){var t;return t=this.find("markarea"),this.container=this.find("mycontainer"),this.previewOn=!1,this.editormux=!1,this.editor=new EasyMDE({element:t,autoDownloadFontAwesome:!1,autofocus:!0,tabSize:4,indentWithTabs:!0,toolbar:["bold","italic","heading","|","quote","code","unordered-list","ordered-list","|","link","image","table","horizontal-rule",{name:"shared image",className:"fa fa-share-square",action:t=>this.shareFile(["image/.*"],t=>this.editor.codemirror.getDoc().replaceSelection(`![](${this._api.handler.shared}/${t})`))},{name:"local image",className:"fa fa-file-image-o",action:t=>{if(this.book)return this.openDialog("FileDialog",{title:__("Select image file"),mimes:["image/.*"],root:this.book.path}).then(t=>{var e;return e=t.file.path.replace(this.book.path,""),this.editor.codemirror.getDoc().replaceSelection(`[[@book:image:${e}]]`)}).catch(t=>this.error(t.toString(),t))}},{name:"Youtube",className:"fa fa-youtube",action:t=>{var e,i;return e=this.editor.codemirror.getDoc(),i=this.editor.codemirror.getSelection()||"",e.replaceSelection(`[[youtube:${i}]]`)}},{name:"3d object",className:"fa fa-cube",action:t=>{if(this.book)return this.openDialog("FileDialog",{title:__("Select 3d model"),mimes:["text/wavefront-obj","model/gltf-binary"],root:this.book.path}).then(t=>{var e;return e=t.file.path.replace(this.book.path,""),this.editor.codemirror.getDoc().replaceSelection(`[[@book:3dmodel:${e}]]`)}).catch(t=>this.error(t.toString(),t))}},"|",{name:__("Preview"),className:"fa fa-eye no-disable",action:t=>(EasyMDE.togglePreview(t),renderMathInElement(this.find("mycontainer")),this.renderLocalElement())}],previewRender:(t,e)=>{var i;return this.book&&(t=t.replace(/\[\[@book:image:([^\]]*)\]\]/g,(t,e)=>`![](${this._api.handle.get}/${this.book.path}/${e})`)),i=this.editor.markdown(t),e.innerHTML=i}}),this.on("resize",t=>this.resizeContent()),this.bindKey("ALT-N",()=>this.actionFile(this.name+"-New")),this.bindKey("ALT-O",()=>this.actionFile(this.name+"-Open")),this.bindKey("CTRL-S",()=>this.actionFile(this.name+"-Save"))}reloadEditor(){return void 0===this.currentToc?(this.editor.value(""),this.scheme.apptitle=this.name):(this.editor.value(this.currentToc.descFile.cache||""),this.scheme.apptitle="Booklet - "+this.currentToc.descFile.path)}saveContext(){if(this.currentToc)return this.currentToc.descFile.cache=this.editor.value()}resizeContent(){var t,e,i,r,n;return e=$(".EasyMDEContainer",this.container).children(),r=$(this.scheme).find(".afx-window-top")[0],n=e[0],i=e[3],t=$(this.scheme).height()-$(r).height()-$(n).height()-$(i).height()-40,$(e[1]).css("height",t+"px")}menu(){return[{text:"__(File)",nodes:[{text:"__(New booklet)",dataid:this.name+"-New",shortcut:"A-N"},{text:"__(Open a booklet)",dataid:this.name+"-Open",shortcut:"A-O"},{text:"__(Save a booklet)",dataid:this.name+"-Save",shortcut:"C-S"}],onchildselect:t=>this.actionFile(t.data.item.data.dataid)}]}actionFile(t){switch(t){case this.name+"-Open":return this.checkForDirty(()=>this.openDialog("FileDialog",{title:__("Open book"),mimes:["dir"]}).then(t=>(this.book=new e(t.file.path),this.book.read(t.file.path).then(()=>(this.book.treepath=this.book.path,this.tree.selectedItem=void 0,this.displayToc(),this.notify(__("Book loaded")))).catch(t=>this.error(__("Cannot load book: {0}",t.toString()),t)))).catch(t=>this.error(t.toString(),t)));case this.name+"-New":return this.openDialog("FileDialog",{title:__("New book at"),mimes:["dir"],file:{basename:__("BookName")}}).then(t=>this.newAt(`${t.file.path}/${t.name}`)).catch(t=>this.error(t.toString(),t));case this.name+"-Save":if(!this.book)return;return this.currentToc&&this.saveContext(),this.displayToc(),this.book.save().then(()=>(this.dirty=!1,this.notify(__("Book saved")))).catch(t=>this.error(__("Can't save the book : {0}",t.toString()),t))}}checkForDirty(t){return this.dirty?this.ask({title:__("Continue ?"),text:__("Book is unsaved, you want to continue ?")}).then(e=>{if(e)return t()}):t()}open(t){return this.emux=!0,this.saveContext(),this.currentToc=t,this.reloadEditor(),this.displayToc(),this.emux=!1}newAt(t){return this.tree.selectedItem=void 0,this.book=new e(t),this.book.treepath=this.book.path,this.currentToc=void 0,this.reloadEditor(),this.displayToc()}displayToc(){return this.book.toc(),this.tree.data=this.book,this.tree.expandAll()}cleanup(t){if(this.dirty)return t.preventDefault(),this.checkForDirty(()=>(this.dirty=!1,this.quit()))}renderLocalElement(){}}).dependencies=["pkg://SimpleMDE/main.js","pkg://SimpleMDE/main.css","pkg://Katex/main.js","pkg://Katex/main.css"],this.OS.register("Booklet",t),r=class{constructor(t){this.text=t,this.loaded=!0}save(){}remove(){}toc(){}updateName(){var t;return(t=new RegExp("^s*#+(.*)\n","g").exec(this.descFile.cache))&&2===t.length?(this.hasMeta&&this.metaFile&&(this.metaFile.dirty=!0),this.parent&&this.parent.hasMeta&&this.parent.metaFile&&(this.parent.metaFile.dirty=!0),this.text=t[1].trim()):this.text}remove(){return new Promise((t,e)=>{var i;return(i=this.path.asFileHandle()).meta().then(r=>i.remove().then(i=>this.parent?this.parent.removeChild(this).then((function(){return t()})).catch((function(t){return e(__e(t))})):t()).catch((function(t){return e(__e(t))}))).catch(i=>this.parent?this.parent.removeChild(this).then((function(){return t()})).catch((function(t){return e(__e(t))})):t())})}},a=class extends r{constructor(t,e,i){super("Untitle"),this.type=t,this.path=e,this.hasMeta=i,this.init()}init(){return this.cnt=0,this.nodes=[],this.hasMeta&&(this.metaFile=(this.path+"/meta.json").asFileHandle()),this.descFile=(this.path+"/INTRO.md").asFileHandle()}up(t){var e;if(t&&(e=this.nodes.indexOf(t))>0)return this.nodes.splice(e,1),this.nodes.splice(e-1,0,t)}down(t){var e;if(t&&(e=this.nodes.indexOf(t))>=0&&e(this.nodes.splice(this.nodes.indexOf(t),1),this.hasMeta&&this.metaFile?(this.metaFile.dirty=!0,this.updateMeta().then((function(){return e()})).catch((function(t){return i(__e(t))}))):e()))}read(t){return new Promise((e,i)=>(this.path=t,this.init(),this.loaded=!1,this.metaFile.meta().then(t=>this.metaFile.read("json").then(t=>{var i,r,n,a,s,h,c;for(this.text=t.name,s=[],r=n=0,a=(h=t.entries).length;n{var n,a;return 0===r.length?(this.cnt=t.cnt,e()):(n=r.splice(0,1)[0],(a=new o[n.type](this)).name=n.name,a.read(n.path.replace("book://",this.root)).then(()=>i(r)).catch(t=>i(r)))})(s)}).catch((function(t){return i(__e(t))}))).catch((function(t){return i(__e(t))}))))}size(){return this.nodes.length}mkdir(){return new Promise((t,e)=>{var i;return(i=this.path.asFileHandle()).meta().then(e=>t()).catch(r=>{var n;return n=i.basename,(i=i.parent().asFileHandle()).mk(n).then(e=>t()).catch((function(t){return e(__e(t))}))})})}mkdirs(){return new Promise((t,e)=>{var i,r,n,a,s,o;if(a=[],"Section"!==this.type)for(i=r=0,n=(s=this.nodes).length;r{var i;return(i=r=>0===r.length?t():r.splice(0,1)[0].mkdirs().then(()=>i(r)).catch((function(t){return e(__e(t))})))(a)}).catch((function(t){return e(__e(t))}))})}updateMeta(){return new Promise((t,e)=>{var i,r,n,a,s,o,h;if(!this.metaFile.dirty)return t();for(r=[],n=a=0,s=(o=this.nodes).length;a(this.metaFile.dirty=!1,t())).catch((function(t){return e(__e(t))}))})}update(){return new Promise((t,e)=>this.updateMeta().then(()=>this.descFile.dirty?this.descFile.write("text/plain").then(e=>(this.descFile.dirty=!1,t())).catch((function(t){return e(__e(t))})):t()).catch((function(t){return e(__e(t))})))}updateAll(){return new Promise((t,e)=>{var i,r,n,a,s,o;for(a=[],i=r=0,n=(s=this.nodes).length;r{var i;return(i=r=>0===r.length?t():r.splice(0,1)[0].updateAll().then(()=>i(r)).catch((function(t){return e(__e(t))})))(a)}).catch((function(t){return e(__e(t))}))})}toc(){var t,e,i;for(this.updateName(),t=0,e=(i=this.nodes).length;tthis.mkdirs().then(()=>this.updateAll().then(()=>t()).catch((function(t){return e(__e(t))}))).catch((function(t){return e(__e(t))})))}},Chapter:i=class extends a{constructor(t){super("Chapter",`${t.path}/c_${t.cnt}`,!0),t.add(this)}},Section:s=class extends a{constructor(t){super("Section",`${t.path}/s_${t.cnt}`,!0),t.add(this)}},File:n=class extends r{constructor(t){super("Untitle file"),this.section=t,this.hasMeta=!1,this.type="File",this.path=`${this.section.path}/f_${this.section.cnt}.md`,this.descFile=this.path.asFileHandle(),this.section.add(this)}updateAll(){return new Promise((t,e)=>this.descFile.dirty?this.descFile.write("text/plain").then(e=>(this.descFile.dirty=!1,t())).catch(t=>e(__e(t))):t())}read(t){return new Promise((e,i)=>(this.loaded=!1,this.treepath=t,this.path=t,this.descFile=this.path.asFileHandle(),e()))}toc(){return this.updateName(),this}}}}).call(this); \ No newline at end of file diff --git a/Booklet/build/debug/package.json b/Booklet/build/debug/package.json index 50fbbd3..6f548a9 100644 --- a/Booklet/build/debug/package.json +++ b/Booklet/build/debug/package.json @@ -7,9 +7,9 @@ "author": "Xuan Sang LE", "email": "mrsang@lxsang.me" }, - "version":"0.2.4-a", + "version":"0.2.5-a", "category":"Office", "iconclass":"bi bi-journals", - "dependencies": ["SimpleMDE@1.11.2-r","Katex@0.11.1-r"], + "dependencies": ["SimpleMDE@2.18.0-r","Katex@0.11.1-r"], "mimes":["dir"] } \ No newline at end of file diff --git a/Booklet/build/release/Booklet.zip b/Booklet/build/release/Booklet.zip index 8667cb3c45d62cc24adf0d8dd21eb08c551d2820..5b0f39545a73419ad2a2cfa5d125010a739e7901 100644 GIT binary patch delta 4791 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 R`-`JKO_C?F1kvB!e*ihF+$R74 delta 4710 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 O@1*^!#!mCk?!N%~{II$J diff --git a/Booklet/coffees/main.coffee b/Booklet/coffees/main.coffee index 82a0d9f..00eef0a 100644 --- a/Booklet/coffees/main.coffee +++ b/Booklet/coffees/main.coffee @@ -166,7 +166,7 @@ class Booklet extends this.OS.application.BaseApplication @previewOn = false @editormux = false - @editor = new SimpleMDE + @editor = new EasyMDE element: markarea autoDownloadFontAwesome: false autofocus: true @@ -232,7 +232,7 @@ class Booklet extends this.OS.application.BaseApplication name: __("Preview"), className: "fa fa-eye no-disable", action: (e) => - SimpleMDE.togglePreview e + EasyMDE.togglePreview e #/console.log @select ".editor-preview editor-preview-active" renderMathInElement @find "mycontainer" @renderLocalElement() @@ -246,7 +246,7 @@ class Booklet extends this.OS.application.BaseApplication preview.innerHTML = html - @on "hboxchange", (e) => @resizeContent() + @on "resize", (e) => @resizeContent() @bindKey "ALT-N", () => @actionFile "#{@name}-New" @bindKey "ALT-O", () => @actionFile "#{@name}-Open" @bindKey "CTRL-S", () => @actionFile "#{@name}-Save" @@ -263,12 +263,12 @@ class Booklet extends this.OS.application.BaseApplication @currentToc.descFile.cache = @editor.value() resizeContent: () -> - children = ($ @container).children() + children = ($ ".EasyMDEContainer", @container).children() titlebar = (($ @scheme).find ".afx-window-top")[0] - toolbar = children[1] - statusbar = children[4] + toolbar = children[0] + statusbar = children[3] cheight = ($ @scheme).height() - ($ titlebar).height() - ($ toolbar).height() - ($ statusbar).height() - 40 - ($ children[2]).css("height", cheight + "px") + ($ children[1]).css("height", cheight + "px") menu: () -> diff --git a/Booklet/package.json b/Booklet/package.json index 50fbbd3..6f548a9 100644 --- a/Booklet/package.json +++ b/Booklet/package.json @@ -7,9 +7,9 @@ "author": "Xuan Sang LE", "email": "mrsang@lxsang.me" }, - "version":"0.2.4-a", + "version":"0.2.5-a", "category":"Office", "iconclass":"bi bi-journals", - "dependencies": ["SimpleMDE@1.11.2-r","Katex@0.11.1-r"], + "dependencies": ["SimpleMDE@2.18.0-r","Katex@0.11.1-r"], "mimes":["dir"] } \ No newline at end of file diff --git a/packages.json b/packages.json index 80318ae..c75cf7f 100644 --- a/packages.json +++ b/packages.json @@ -95,8 +95,8 @@ "description": "https://raw.githubusercontent.com/lxsang/antosdk-apps/2.0.x/Blogger/README.md", "category": "Internet", "author": "Xuan Sang LE", - "version": "0.2.8-a", - "dependencies": ["SimpleMDE@1.11.2-r","Katex@0.11.1-r"],"mimes":["none"], + "version": "0.2.9-a", + "dependencies": ["SimpleMDE@2.18.0-r","Katex@0.11.1-r"],"mimes":["none"], "download": "https://raw.githubusercontent.com/lxsang/antosdk-apps/2.0.x/Blogger/build/release/Blogger.zip" }, { @@ -105,8 +105,8 @@ "description": "https://raw.githubusercontent.com/lxsang/antosdk-apps/2.0.x/Booklet/README.md", "category": "Office", "author": "Xuan Sang LE", - "version": "0.2.4-a", - "dependencies": ["SimpleMDE@1.11.2-r","Katex@0.11.1-r"],"mimes":["dir"], + "version": "0.2.5-a", + "dependencies": ["SimpleMDE@2.18.0-r","Katex@0.11.1-r"],"mimes":["dir"], "download": "https://raw.githubusercontent.com/lxsang/antosdk-apps/2.0.x/Booklet/build/release/Booklet.zip" }, {