From 2be2bae35c624b74f7792974e7e049e0b1fe1e8d Mon Sep 17 00:00:00 2001 From: lxsang Date: Mon, 4 Jan 2021 09:32:21 +0000 Subject: [PATCH] fix missing library --- DiffEditor/build/debug/main.js | 2 +- DiffEditor/build/release/DiffEditor.zip | Bin 7270 -> 7311 bytes DiffEditor/coffees/main.coffee | 25 +++++++++++++----------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/DiffEditor/build/debug/main.js b/DiffEditor/build/debug/main.js index 63d3b0f..f366daa 100644 --- a/DiffEditor/build/debug/main.js +++ b/DiffEditor/build/debug/main.js @@ -1 +1 @@ -(function(){var t;(t=class extends this.OS.application.BaseApplication{constructor(t){super("DiffEditor",t)}main(){var t,e,i,r,s,o;for(this.editor_cnt=this.find("diffeditor"),this.fileview=this.find("fileview"),this.fileview.fetch=t=>new Promise((e,i)=>t.asFileHandle().read().then(t=>t.error?i(t.error):e(t.result)).catch(t=>i(__e(t)))),this.fileview.onfileopen=t=>{if(t.data&&t.data.path&&"dir"!==t.data.type)return this.openFile(t.data.path.asFileHandle())},this.currdir=void 0,ace.config.set("basePath","scripts/ace"),ace.require("ace/ext/language_tools"),this.modelist=ace.require("ace/ext/modelist"),i=[],t=0,e=(s=this.modelist.modes).length;t(this.editors.left.getSession().setMode(t.data.item.data.mode),this.editors.right.getSession().setMode(t.data.item.data.mode)),this.differ=new AceDiff({element:this.editor_cnt,theme:"ace/theme/monokai",left:{content:""},right:{content:""}}),this.editors=this.differ.getEditors(),r={enableBasicAutocompletion:!0,enableSnippets:!0,enableLiveAutocompletion:!0,highlightActiveLine:!0,highlightSelectedWord:!0,behavioursEnabled:!0,fontSize:"10pt",showInvisibles:!0},this.editors.left.setOptions(r),this.editors.right.setOptions(r),this.editors.left.current_file=void 0,this.editors.right.current_file=void 0,this.editors.left.afx_label=this.find("left-file"),this.editors.right.afx_label=this.find("right-file"),this.editors.left.mux=!1,this.editors.right.mux=!1,this.on("resize",()=>(this.editors=this.differ.getEditors(),this.editors.left.resize(),this.editors.right.resize())),$(".acediff__left .ace_scrollbar-v",this.editor_cnt).scroll(()=>this.editors.right.session.setScrollTop(this.editors.left.session.getScrollTop())),$(".acediff__right .ace_scrollbar-v",this.editor_cnt).scroll(()=>this.editors.left.session.setScrollTop(this.editors.right.session.getScrollTop())),this.editors.left.on("focus",t=>this.current_editor=this.editors.left),this.editors.right.on("focus",t=>this.current_editor=this.editors.right),this.editors.left.on("input",t=>this.editors.left.mux?this.editors.left.mux=!1:this.editors.left.current_file?this.editors.left.current_file.dirty?void 0:(this.editors.left.current_file.dirty=!0,this.editors.left.afx_label.text+="*"):this.editors.left.afx_label.text=__("Temporary file")),this.editors.right.on("input",t=>this.editors.right.mux?this.editors.right.mux=!1:this.editors.right.current_file?this.editors.right.current_file.dirty?void 0:(this.editors.right.current_file.dirty=!0,this.editors.right.afx_label.text+="*"):this.editors.right.afx_label.text=__("Temporary file")),this.current_editor=this.editors.left,this.current_editor.focus(),this.bindKey("ALT-O",()=>this.menuAction("open")),this.bindKey("ALT-F",()=>this.menuAction("opendir")),this.bindKey("CTRL-S",()=>this.menuAction("save")),this.toggleSideBar()}toggleSideBar(){return this.currdir?($(this.fileview).show(),this.fileview.path=this.currdir.path):$(this.fileview).hide(),this.trigger("resize")}menu(){return[{text:__("File"),nodes:[{text:__("Open"),dataid:"open",shortcut:"A-O"},{text:__("Open Folder"),dataid:"opendir",shortcut:"A-F"},{text:__("Save"),dataid:"save",shortcut:"C-S"}],onchildselect:t=>this.menuAction(t.data.item.data.dataid)}]}openFile(t){return this.current_editor.mux=!0,t.read().then(e=>{var i,r,s,o,h,l;for(t.cache=e,this.current_editor.current_file=t,this.current_editor.afx_label.text=t.path,this.current_editor.setValue(e,-1),h=this.modelist.getModeForPath(t.path),i=s=0,o=(l=this.langlist.data).length;sthis.openFile(t.file.path.asFileHandle()));case"opendir":return this.openDialog("FileDialog",{title:__("Open folder"),mimes:["dir"]}).then(t=>(this.currdir=t.file.path.asFileHandle(),this.toggleSideBar()));case"save":return(e=t=>{if(t.current_file&&t.current_file.dirty)return t.current_file.cache=t.getValue(),t.current_file.write("text/plain").then(e=>(t.current_file.dirty=!1,t.afx_label.text=t.current_file.path,this.notify(__("File {0} saved",t.current_file.path)))).catch(e=>this.error(__("Unable to save to: {0}",t.current_file.path),e))})(this.editors.left),e(this.editors.right);default:return console.log(t)}}cleanup(t){var e;return e=!1,this.editors.left.current_file&&this.editors.left.current_file.dirty&&(e=!0),this.editors.right.current_file&&this.editors.right.current_file.dirty&&(e=!0),e?(t.preventDefault(),this.ask({title:__("Unsaved changes"),text:__("Ignore modification ?")}).then(t=>{if(t)return this.editors.left.current_file.dirty=!1,this.editors.right.current_file.dirty=!1,this.quit()})):this.differ.destroy()}}).dependencies=["os://scripts/ace/ace.js","os://scripts/ace/ext-themelist.js","os://scripts/ace/ext-language_tools.js","pkg://AceDiff/main.js","pkg://AceDiff/main.css"],this.OS.register("DiffEditor",t)}).call(this); \ No newline at end of file +(function(){var t;(t=class extends this.OS.application.BaseApplication{constructor(t){super("DiffEditor",t)}main(){var t,e,i,r,s,o;for(this.editor_cnt=this.find("diffeditor"),this.fileview=this.find("fileview"),this.fileview.fetch=t=>new Promise((e,i)=>t.asFileHandle().read().then(t=>t.error?i(t.error):e(t.result)).catch(t=>i(__e(t)))),this.fileview.onfileopen=t=>{if(t.data&&t.data.path&&"dir"!==t.data.type)return this.openFile(t.data.path.asFileHandle())},this.currdir=void 0,ace.config.set("basePath","scripts/ace"),ace.require("ace/ext/language_tools"),this.modelist=ace.require("ace/ext/modelist"),this.differ=new AceDiff({element:this.editor_cnt,theme:"ace/theme/monokai",left:{content:""},right:{content:""}}),this.editors=this.differ.getEditors(),r={enableBasicAutocompletion:!0,enableSnippets:!0,enableLiveAutocompletion:!0,highlightActiveLine:!0,highlightSelectedWord:!0,behavioursEnabled:!0,fontSize:"10pt",showInvisibles:!0},this.editors.left.setOptions(r),this.editors.right.setOptions(r),this.editors.left.current_file=void 0,this.editors.right.current_file=void 0,this.editors.left.afx_label=this.find("left-file"),this.editors.right.afx_label=this.find("right-file"),this.editors.left.mux=!1,this.editors.right.mux=!1,this.on("resize",()=>(this.editors=this.differ.getEditors(),this.editors.left.resize(),this.editors.right.resize())),$(".acediff__left .ace_scrollbar-v",this.editor_cnt).scroll(()=>this.editors.right.session.setScrollTop(this.editors.left.session.getScrollTop())),$(".acediff__right .ace_scrollbar-v",this.editor_cnt).scroll(()=>this.editors.left.session.setScrollTop(this.editors.right.session.getScrollTop())),this.editors.left.on("focus",t=>this.current_editor=this.editors.left),this.editors.right.on("focus",t=>this.current_editor=this.editors.right),this.editors.left.on("input",t=>this.editors.left.mux?this.editors.left.mux=!1:this.editors.left.current_file?this.editors.left.current_file.dirty?void 0:(this.editors.left.current_file.dirty=!0,this.editors.left.afx_label.text+="*"):this.editors.left.afx_label.text=__("Temporary file")),this.editors.right.on("input",t=>this.editors.right.mux?this.editors.right.mux=!1:this.editors.right.current_file?this.editors.right.current_file.dirty?void 0:(this.editors.right.current_file.dirty=!0,this.editors.right.afx_label.text+="*"):this.editors.right.afx_label.text=__("Temporary file")),this.current_editor=this.editors.left,this.current_editor.focus(),i=[],t=0,e=(s=this.modelist.modes).length;t(this.editors.left.getSession().setMode(t.data.item.data.mode),this.editors.right.getSession().setMode(t.data.item.data.mode)),this.bindKey("ALT-O",()=>this.menuAction("open")),this.bindKey("ALT-F",()=>this.menuAction("opendir")),this.bindKey("CTRL-S",()=>this.menuAction("save")),this.toggleSideBar()}toggleSideBar(){return this.currdir?($(this.fileview).show(),this.fileview.path=this.currdir.path):$(this.fileview).hide(),this.trigger("resize")}menu(){return[{text:__("File"),nodes:[{text:__("Open"),dataid:"open",shortcut:"A-O"},{text:__("Open Folder"),dataid:"opendir",shortcut:"A-F"},{text:__("Save"),dataid:"save",shortcut:"C-S"}],onchildselect:t=>this.menuAction(t.data.item.data.dataid)}]}openFile(t){return this.current_editor.mux=!0,t.read().then(e=>{var i,r,s,o,l,h;for(t.cache=e,this.current_editor.current_file=t,this.current_editor.afx_label.text=t.path,this.current_editor.setValue(e,-1),l=this.modelist.getModeForPath(t.path),i=s=0,o=(h=this.langlist.data).length;sthis.openFile(t.file.path.asFileHandle()));case"opendir":return this.openDialog("FileDialog",{title:__("Open folder"),mimes:["dir"]}).then(t=>(this.currdir=t.file.path.asFileHandle(),this.toggleSideBar()));case"save":return(e=t=>{if(t.current_file&&t.current_file.dirty)return t.current_file.cache=t.getValue(),t.current_file.write("text/plain").then(e=>(t.current_file.dirty=!1,t.afx_label.text=t.current_file.path,this.notify(__("File {0} saved",t.current_file.path)))).catch(e=>this.error(__("Unable to save to: {0}",t.current_file.path),e))})(this.editors.left),e(this.editors.right);default:return console.log(t)}}cleanup(t){var e;return e=!1,this.editors.left.current_file&&this.editors.left.current_file.dirty&&(e=!0),this.editors.right.current_file&&this.editors.right.current_file.dirty&&(e=!0),e?(t.preventDefault(),this.ask({title:__("Unsaved changes"),text:__("Ignore modification ?")}).then(t=>{if(t)return this.editors.left.current_file.dirty=!1,this.editors.right.current_file.dirty=!1,this.quit()})):this.differ.destroy()}}).dependencies=["os://scripts/ace/ace.js","os://scripts/ace/ext-language_tools.js","os://scripts/ace/ext-themelist.js","os://scripts/ace/ext-language_tools.js","pkg://AceDiff/main.js","pkg://AceDiff/main.css"],this.OS.register("DiffEditor",t)}).call(this); \ No newline at end of file diff --git a/DiffEditor/build/release/DiffEditor.zip b/DiffEditor/build/release/DiffEditor.zip index 0b8266ac62135c89a3e1225b481e8a0b5d19bda7..f9ef329470332f1428122b68e071602f36684086 100644 GIT binary patch delta 336 zcmaE6(Qhdp;LXg!#Q*}wy;Xv8?OB)TiZC$fZWPa9+PsfhpM7&PlLO=CPh3q*%sDz4 zlgoMQ8FMCo=hbJ-n5@pH#+wnH8LO9@pOR{8Yn!t|@-|_S$qR)=Cr=Vy$aKPc zvZ+WgklNfOQp54<)#F9 zGct)VKpc4j=*a88&#&}jWMBYc4zSZ<#B!jv+{Da0z2xFzR9%x_OUuMdi!m@1BqnDk zrl;y<73b$6D>(@?n8`tC{!(TJ1`y_knF*$+i8C-1CugMQrs`#sFAZ`}*ntV@MCZrB1pPQJOr`6MotU1gmsOmfhpKb3pNtG+?&NG4IW}u)ka7UjV?^`- diff --git a/DiffEditor/coffees/main.coffee b/DiffEditor/coffees/main.coffee index 7e4c074..15cabc8 100644 --- a/DiffEditor/coffees/main.coffee +++ b/DiffEditor/coffees/main.coffee @@ -23,17 +23,6 @@ class DiffEditor extends @OS.application.BaseApplication ace.config.set('basePath', "scripts/ace") ace.require("ace/ext/language_tools") @modelist = ace.require("ace/ext/modelist") - list = [] - for v in @modelist.modes - list.push { - text: v.caption, - mode: v.mode - } - @langlist = @find("langmode") - @langlist.data = list - @langlist.onlistselect = (e) => - @editors.left.getSession().setMode e.data.item.data.mode - @editors.right.getSession().setMode e.data.item.data.mode @differ = new AceDiff({ # ace: window.ace, @@ -97,9 +86,22 @@ class DiffEditor extends @OS.application.BaseApplication @editors.right.current_file.dirty = true @editors.right.afx_label.text += "*" + @current_editor = @editors.left @current_editor.focus() + list = [] + for v in @modelist.modes + list.push { + text: v.caption, + mode: v.mode + } + @langlist = @find("langmode") + @langlist.data = list + @langlist.onlistselect = (e) => + @editors.left.getSession().setMode e.data.item.data.mode + @editors.right.getSession().setMode e.data.item.data.mode + @bindKey "ALT-O", () => @menuAction("open") @bindKey "ALT-F", () => @menuAction("opendir") @bindKey "CTRL-S", () => @menuAction("save") @@ -198,6 +200,7 @@ class DiffEditor extends @OS.application.BaseApplication DiffEditor.dependencies = [ "os://scripts/ace/ace.js", + "os://scripts/ace/ext-language_tools.js", "os://scripts/ace/ext-themelist.js", "os://scripts/ace/ext-language_tools.js", "pkg://AceDiff/main.js",