diff --git a/release/antos-1.1.2.tar.gz b/release/antos-1.1.2.tar.gz index 34b6c02..1dbb5f9 100644 Binary files a/release/antos-1.1.2.tar.gz and b/release/antos-1.1.2.tar.gz differ diff --git a/src/packages/CodePad/BaseExtension.ts b/src/packages/CodePad/BaseExtension.ts index 405c1f8..c706221 100644 --- a/src/packages/CodePad/BaseExtension.ts +++ b/src/packages/CodePad/BaseExtension.ts @@ -435,7 +435,13 @@ namespace OS { `${this.app.currdir.path}/${file}` .asFileHandle() .read("json") - .then((data) => resolve(data)) + .then((data) => { + if(!data.root && this.app.currdir) + { + data.root = this.app.currdir.path; + } + resolve(data); + }) .catch((e) => { return reject( API.throwe(__("Unable to read meta-data")) diff --git a/src/packages/CodePad/ExtensionMaker.ts b/src/packages/CodePad/ExtensionMaker.ts index 25ecfde..cacbbd1 100644 --- a/src/packages/CodePad/ExtensionMaker.ts +++ b/src/packages/CodePad/ExtensionMaker.ts @@ -293,7 +293,9 @@ namespace OS { await API.requires(path); let v: GenericObject; if (this.app.extensions[meta.meta.name]) { - this.app.extensions[meta.meta.name].child = []; + this.app.extensions[meta.meta.name].text = meta.meta.text; + this.app.extensions[meta.meta.name].nodes = []; + this.app.extensions[meta.meta.name].ext = new App.extensions[meta.meta.name](this.app); for (v of meta.meta.actions) { this.app.extensions[meta.meta.name].addAction(v); } diff --git a/src/packages/CodePad/main.ts b/src/packages/CodePad/main.ts index 605f522..0c0f5a7 100644 --- a/src/packages/CodePad/main.ts +++ b/src/packages/CodePad/main.ts @@ -428,7 +428,8 @@ namespace OS { stat.column + 1, stat.line ); - this.langstat.text = stat.langmode.text; + if(stat.langmode) + this.langstat.text = stat.langmode.text; this.filestat.text = stat.file } diff --git a/src/packages/CodePad/templates/ext-extension.tpl b/src/packages/CodePad/templates/ext-extension.tpl index 352b742..e262274 100644 --- a/src/packages/CodePad/templates/ext-extension.tpl +++ b/src/packages/CodePad/templates/ext-extension.tpl @@ -1,5 +1,4 @@ { - "root": "{1}", "javascripts": [], "coffees": ["{0}.coffee"], "copies": [], diff --git a/src/packages/CodePad/templates/sdk-project.tpl b/src/packages/CodePad/templates/sdk-project.tpl index fe075ad..23b620c 100644 --- a/src/packages/CodePad/templates/sdk-project.tpl +++ b/src/packages/CodePad/templates/sdk-project.tpl @@ -1,6 +1,5 @@ { "name": "{0}", - "root": "{1}", "css": [], "javascripts": [], "coffees": ["coffees/main.coffee"],