From de639e6d3948df9a43700f106b96ee0eeb525bf2 Mon Sep 17 00:00:00 2001 From: DanyLE Date: Wed, 4 Jan 2023 00:08:32 +0100 Subject: [PATCH] Fix window resize bug on Markon --- MarkOn/README.md | 1 + MarkOn/build/debug/README.md | 1 + MarkOn/build/debug/main.js | 2 +- MarkOn/build/debug/package.json | 2 +- MarkOn/build/release/MarkOn.zip | Bin 2292 -> 2319 bytes MarkOn/main.coffee | 10 +++++----- MarkOn/package.json | 2 +- packages.json | 2 +- 8 files changed, 11 insertions(+), 9 deletions(-) diff --git a/MarkOn/README.md b/MarkOn/README.md index 2c380ff..2d559f6 100644 --- a/MarkOn/README.md +++ b/MarkOn/README.md @@ -3,4 +3,5 @@ Simple Markdown editor for antOS ## Change log +- 0.1.1-a: Fix window resize bug - 0.1.0-a: Use the new EasyMDE library \ No newline at end of file diff --git a/MarkOn/build/debug/README.md b/MarkOn/build/debug/README.md index 2c380ff..2d559f6 100644 --- a/MarkOn/build/debug/README.md +++ b/MarkOn/build/debug/README.md @@ -3,4 +3,5 @@ Simple Markdown editor for antOS ## Change log +- 0.1.1-a: Fix window resize bug - 0.1.0-a: Use the new EasyMDE library \ No newline at end of file diff --git a/MarkOn/build/debug/main.js b/MarkOn/build/debug/main.js index de3443b..879fbfa 100644 --- a/MarkOn/build/debug/main.js +++ b/MarkOn/build/debug/main.js @@ -1 +1 @@ -(function(){var e;(e=class extends this.OS.application.BaseApplication{constructor(e){super("MarkOn",e)}main(){var e;return e=this.find("markarea"),this.container=this.find("mycontainer"),this.previewOn=!1,this.args&&this.args.length>0?this.currfile=this.args[0].path.asFileHandle():this.currfile="Untitled".asFileHandle(),this.editormux=!1,this.editor=new EasyMDE({element:e,autoDownloadFontAwesome:!1,autofocus:!0,tabSize:4,indentWithTabs:!0,toolbar:["bold","italic","heading","|","quote","code","unordered-list","ordered-list","|","link","image","table","horizontal-rule","|",{name:"preview",className:"fa fa-eye no-disable",action:e=>(this.previewOn=!this.previewOn,EasyMDE.togglePreview(e))}]}),this.editor.codemirror.on("change",()=>{if(!this.editormux)return!1===this.currfile.dirty?(this.currfile.dirty=!0,this.scheme.apptitle=this.currfile.basename+"*"):void 0}),this.on("hboxchange",e=>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")),this.bindKey("ALT-W",()=>this.actionFile(this.name+"-Saveas")),this.resizeContent(),this.open(this.currfile)}resizeContent(){var e,t,i,a,s;return t=$(this.container).children(),a=$(this.scheme).find(".afx-window-top")[0],s=t[1],i=t[4],e=$(this.scheme).height()-$(a).height()-$(s).height()-$(i).height()-40,$(t[2]).css("height",e+"px")}open(e){if("Untitled"!==e.path)return e.dirty=!1,e.read().then(t=>(this.currfile=e,this.editormux=!0,this.editor.value(t),this.scheme.apptitle=""+this.currfile.basename,this.editormux=!1)).catch(t=>this.error(__("Unable to open: {0}",e.path),t))}save(e){return e.write("text/plain").then(t=>t.error?this.error(__("Error saving file {0}: {1}",e.basename,t.error)):(e.dirty=!1,e.text=e.basename,this.scheme.apptitle=""+this.currfile.basename)).catch(t=>this.error(__("Unable to save file: {0}",e.path),t))}menu(){return[{text:"__(File)",nodes:[{text:"__(New)",dataid:this.name+"-New",shortcut:"A-N"},{text:"__(Open)",dataid:this.name+"-Open",shortcut:"A-O"},{text:"__(Save)",dataid:this.name+"-Save",shortcut:"C-S"},{text:"__(Save as)",dataid:this.name+"-Saveas",shortcut:"A-W"}],onchildselect:e=>this.actionFile(e.data.item.data.dataid)}]}actionFile(e){var t;switch(t=()=>this.openDialog("FileDialog",{title:__("Save as"),file:this.currfile}).then(e=>{var t;return t=e.file.path.asFileHandle(),"file"===e.file.type&&(t=t.parent()),this.currfile.setPath(`${t.path}/${e.name}`),this.save(this.currfile)}),e){case this.name+"-Open":return this.openDialog("FileDialog",{title:__("Open file")}).then(e=>this.open(e.file.path.asFileHandle()));case this.name+"-Save":return this.currfile.cache=this.editor.value(),this.currfile.basename?this.save(this.currfile):t();case this.name+"-Saveas":return this.currfile.cache=this.editor.value(),t();case this.name+"-New":return this.currfile="Untitled".asFileHandle(),this.currfile.cache="",this.editor.value("")}}cleanup(e){if(this.currfile.dirty)return e.preventDefault(),this.openDialog("YesNoDialog",{title:__("Quit"),text:__("Quit without saving ?")}).then(e=>{if(e)return this.currfile.dirty=!1,this.quit()})}}).dependencies=["pkg://SimpleMDE/main.js","pkg://SimpleMDE/main.css"],this.OS.register("MarkOn",e)}).call(this); \ No newline at end of file +(function(){var e;(e=class extends this.OS.application.BaseApplication{constructor(e){super("MarkOn",e)}main(){var e;return e=this.find("markarea"),this.container=this.find("mycontainer"),this.previewOn=!1,this.args&&this.args.length>0?this.currfile=this.args[0].path.asFileHandle():this.currfile="Untitled".asFileHandle(),this.editormux=!1,this.editor=new EasyMDE({element:e,autoDownloadFontAwesome:!1,autofocus:!0,tabSize:4,indentWithTabs:!0,toolbar:["bold","italic","heading","|","quote","code","unordered-list","ordered-list","|","link","image","table","horizontal-rule","|",{name:"preview",className:"fa fa-eye no-disable",action:e=>(this.previewOn=!this.previewOn,EasyMDE.togglePreview(e))}]}),this.editor.codemirror.on("change",()=>{if(!this.editormux)return!1===this.currfile.dirty?(this.currfile.dirty=!0,this.scheme.apptitle=this.currfile.basename+"*"):void 0}),this.on("resize",e=>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")),this.bindKey("ALT-W",()=>this.actionFile(this.name+"-Saveas")),this.resizeContent(),this.open(this.currfile)}resizeContent(){var e,t,i,a,s;return t=$(".EasyMDEContainer",this.mycontainer).children(),a=$(this.scheme).find(".afx-window-top")[0],s=t[0],i=t[3],e=$(this.scheme).height()-$(a).height()-$(s).height()-$(i).height()-40,$(t[1]).css("height",e+"px")}open(e){if("Untitled"!==e.path)return e.dirty=!1,e.read().then(t=>(this.currfile=e,this.editormux=!0,this.editor.value(t),this.scheme.apptitle=""+this.currfile.basename,this.editormux=!1)).catch(t=>this.error(__("Unable to open: {0}",e.path),t))}save(e){return e.write("text/plain").then(t=>t.error?this.error(__("Error saving file {0}: {1}",e.basename,t.error)):(e.dirty=!1,e.text=e.basename,this.scheme.apptitle=""+this.currfile.basename)).catch(t=>this.error(__("Unable to save file: {0}",e.path),t))}menu(){return[{text:"__(File)",nodes:[{text:"__(New)",dataid:this.name+"-New",shortcut:"A-N"},{text:"__(Open)",dataid:this.name+"-Open",shortcut:"A-O"},{text:"__(Save)",dataid:this.name+"-Save",shortcut:"C-S"},{text:"__(Save as)",dataid:this.name+"-Saveas",shortcut:"A-W"}],onchildselect:e=>this.actionFile(e.data.item.data.dataid)}]}actionFile(e){var t;switch(t=()=>this.openDialog("FileDialog",{title:__("Save as"),file:this.currfile}).then(e=>{var t;return t=e.file.path.asFileHandle(),"file"===e.file.type&&(t=t.parent()),this.currfile.setPath(`${t.path}/${e.name}`),this.save(this.currfile)}),e){case this.name+"-Open":return this.openDialog("FileDialog",{title:__("Open file")}).then(e=>this.open(e.file.path.asFileHandle()));case this.name+"-Save":return this.currfile.cache=this.editor.value(),this.currfile.basename?this.save(this.currfile):t();case this.name+"-Saveas":return this.currfile.cache=this.editor.value(),t();case this.name+"-New":return this.currfile="Untitled".asFileHandle(),this.currfile.cache="",this.editor.value("")}}cleanup(e){if(this.currfile.dirty)return e.preventDefault(),this.openDialog("YesNoDialog",{title:__("Quit"),text:__("Quit without saving ?")}).then(e=>{if(e)return this.currfile.dirty=!1,this.quit()})}}).dependencies=["pkg://SimpleMDE/main.js","pkg://SimpleMDE/main.css"],this.OS.register("MarkOn",e)}).call(this); \ No newline at end of file diff --git a/MarkOn/build/debug/package.json b/MarkOn/build/debug/package.json index 3c586a5..df4e0ad 100644 --- a/MarkOn/build/debug/package.json +++ b/MarkOn/build/debug/package.json @@ -6,7 +6,7 @@ "author": "Xuan Sang LE", "email": "xsang.le@gmail.com" }, - "version":"0.1.0-a", + "version":"0.1.1-a", "category":"Office", "iconclass":"fa fa-leanpub", "dependencies": ["SimpleMDE@2.18.0-r"], diff --git a/MarkOn/build/release/MarkOn.zip b/MarkOn/build/release/MarkOn.zip index 7f42f8a7975523fc1958a87907df5130600049ee..49997be9cf641c557e2365d76e7b73e6aa5c6d63 100644 GIT binary patch delta 1962 zcmZuy3pms3AOFp5!;rghs4!D3MY%M$j9Q~cWJP1Nq&5~-6phTCja*WWzu1u@NsPH1 za#;GL_V^7;y<1 z001C>c!S=l{3L?KCkX)fJyZP$TKI|)e23JJu#fV=ani1k@jJ6YGnqWAu_DUZ%@rF? zJ_jA=r~6=-S-5h$@T_%N_W? zl|I~e*IJGe%hDg5)Kit@^id^KZteB4!RP2p4E5CG^09swJ*6@%2bJB<)3SRqZtvmK z;~6QMa?fMln>Ih}H1RFrqg&S>xLlF9i7zjk81pt^i9IjtVs;qfLn;PPDwwg{so*GG z&o{G*uM3y>7Wng$ShcGoUA`rX_hZtQzc#sbO7LvU3%!CPj=8rZ>-pd2x>qI7+JnsC zuF##8>B!q(sxy#l^nC@rG>7i(PvK-HY<~r{$xL33R+M z_|f#C&pT4n=qL?_YMYZhQh83rYioM(h>0BEBInM=K#9k8c&BrGpOkcSg{l#1^@3{e z*MXFK>hT-%?#YE5v1dmI88>@UZ?R_1orWkiE;NMKNGrgiB=&C0riErpe;lN|rtH)2 zsPS!Iu=Rl<_J>-V@XJdB;;QDKywkU>u6jXtuYZb%1@&SCR>ZDPhh5$tuRGdvmETLa zrC+fB$Q|tb99@2!a{gt^P!PkjW`?g>T*?O-a$)BR*AL^?^_|qxynQPIWz2_^19w?n zF>kTs{^UNc148^CU0h40BD@ zJLaRw+$ZxVOiAB_(d|B!Pp>!NU~=Pvp|}G!&I)^qq@6k)$JfDgQP)8 z5tkopSZGwym~eATf#xqyottGs9??O^pc7cIXRMRH07!ow_0lYq;03yP7zce=IRqWG z4(ANrxUR_aAMGkWkh45<{i^kZYE$~l$b%W6Ci9DE5l zeJHQ0ja|=FE^^ke2ugognq=ZypUcLY8o#wK){CSKX4YgOjo$(Oj-R1!C40A1HX2RE zP#sGqK?{zj8;b@bSodKG@3a3 z;ahluUe!aKXWosB6N+AS$3Nv0F~yfK%6o7(JE9%&`tyUH(GL ze~@-gv&U-y)v}04do`l{0nuvkcy&VlQNcZ(g#A&uChi~l{K|VT3*I04;ur5D*oCU# z;#n&KklB@*xto{r7_#NKlMKDvBykTr!;k!eCbj6aWNl8`-1;OZF?K1K3p#=5wtTQ&)6DZVT@Syu)WyvcljSyNZrC-t-^fS&*hCmoj+ zrdyY!Cvs+ONn54xylF?y$`*GQ#jW1BinRrNUj?t}>PQR%Gyw1b0RU7~94Ul=ON2lo z;$m1xFqvs{f@``hVP#WB;EZzN()UyEX?Z3hj(R3?t-!Ktq!D=)&y7XPWLep|@ik;4 zv-?=K7!+hZOjsW_d$V^ti=`>tOqKi{widy%F;I2w7;;-;FYFv4KE5Oo9e{R6;!J&Uf2`~#UHNQ>a^8+~fYxCC`P3%WBeiHDhS5JEgQehzQpR3|Cp%9BAuOfqw}3=l!y@ zrE0~*8?s(WQPe?VD!~6~Us=;&xbB|~?LVpfJChBdOtauh)jP@0sZMat2n1Vq}s+`PMa$IaWFo%zk|&hBr&Z)U%AJ~}VV49&~}0RVs< zP@qU!EonaxU1tFR+Cvx|ZyE-HB!J2c8=uv+#gx8m@FSF^2Hnpm!;PwYe{XqbI+S^p zeUF%QydRAJK3+mrOi#`D!DSU$rJ-8J(q#cG{#(+RmE*U~5&iSLLWjj+(+%dgip8?0<;KbfROXOV;P6u;KY>!A+MwGFC-g z?2^q>#NJ+upx%f?B8q4$jz`C+63|hXVr`M)<4YiLkHpyt2_l(-$n9>mi-l^{A(r)A zTS=DlWtG>jnUy?~*ilH}Yj&9ef%z*s60_&>OxMft%yz}Q6F@hsIwCMSbCJe27SGM5&QkQyP#50*e8=8l) ztX0mdGvDz1GAHU4sQLrC0<|1VdNR5&u;;XX59j3*-}Chmyjf2DlEe(GC47HpX!Zp6 zTj&YPajEzWvTxU_iI8kEKiC{-Vl#rNAa<&>Y}QwcCS3V=9@owRowsyO)QRm|`rzwu z>rG^C#6Te%+W!5*+wLfZ7&Q3W4223xDYC z^9rxL7o8d+I&HzhoF&whZkoiId?OH)XS?I_uDjA9_yvddAi2d>$!&FbeB!%9vV!0z zE5SJ zIY~|9=C-c0+A23e7kh}FwF9Ew1{e%L+mU-Qy5{XzE3g=xXvaD}(%a}X=`7L*!w>7W z!mCn;?i7eswMo?+jB-{LJms=g42!A6u9N`%c_Nxfp^(C(KF}9wN6fd)vntF~L3FSqxfXz@8g4x}SC~JQtoIPqvS+%6kDV3oh&(ylB-7L3 zeewvELnBjmyxS2z+4ZuuJHG>`FQBvgu<$VB9$JF%0Kmz3_+YRen0qer?tb20xb#{t zrYoFrL4}BI8*Pa3hzX~Q%v~o^jF54Ey}n64s)u5k5QGeZO_You;fuB>$8u5J3M_6; z@mqca3PpT{-&5)+jR7Qt-K0?P4tbK@Z{bbV$oSj$MjbtUZRqH{IHoZgta zT_Ia)nV?Vf#c=#UUuqp<@nllSY! z>HXtbMETMfYkvg@y{sfA1qvaM%?JN?jX+yd9Wj3Z!w3#WSmnoJ|t1Kq3@) zSPnxwb=>vr>?r)uEfBI$Bn6fjIr~*WCK=<@^^{igEr~X=M$mB;eIOyS=BxI7uNoVS zNj<*q%(;>pAfVc65r??EgP=iZQVCD4OA!}VH}WI|`%NR;j~P^fnD~MJBUglDHk8I6 z0`@=p{>vWYe}5Vu_%xTNdl7Qj#o#=w0N{spbHTaDyZPfh|55RgUF^;~Mg @resizeContent() + @on "resize", (e) => @resizeContent() @bindKey "ALT-N", () => @actionFile "#{@name}-New" @bindKey "ALT-O", () => @actionFile "#{@name}-Open" @bindKey "CTRL-S", () => @actionFile "#{@name}-Save" @@ -73,12 +73,12 @@ class MarkOn extends this.OS.application.BaseApplication @open @currfile resizeContent: () -> - children = ($ @container).children() + children = ($ ".EasyMDEContainer", @mycontainer).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") open: (file) -> #find table diff --git a/MarkOn/package.json b/MarkOn/package.json index 3c586a5..df4e0ad 100644 --- a/MarkOn/package.json +++ b/MarkOn/package.json @@ -6,7 +6,7 @@ "author": "Xuan Sang LE", "email": "xsang.le@gmail.com" }, - "version":"0.1.0-a", + "version":"0.1.1-a", "category":"Office", "iconclass":"fa fa-leanpub", "dependencies": ["SimpleMDE@2.18.0-r"], diff --git a/packages.json b/packages.json index 8945f73..80318ae 100644 --- a/packages.json +++ b/packages.json @@ -315,7 +315,7 @@ "description": "https://raw.githubusercontent.com/lxsang/antosdk-apps/2.0.x/MarkOn/README.md", "category": "Office", "author": "Xuan Sang LE", - "version": "0.1.0-a", + "version": "0.1.1-a", "dependencies": ["SimpleMDE@2.18.0-r"],"mimes":["text/.*"], "download": "https://raw.githubusercontent.com/lxsang/antosdk-apps/2.0.x/MarkOn/build/release/MarkOn.zip" },